aboutsummaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2017-06-25 18:00:48 -0400
committerAndrew Robbins <contact@andrewrobbins.info>2017-06-25 18:45:34 -0400
commit00966661823723ea929ddf1f913d8ab0c2fc4796 (patch)
treeb3595320f129404ef8c593c223abed7e82643895 /libs
parent0accfe9b22fc8d79461101c33f876767da72d3ef (diff)
downloadlibrebootfr-00966661823723ea929ddf1f913d8ab0c2fc4796.tar.gz
librebootfr-00966661823723ea929ddf1f913d8ab0c2fc4796.zip
Vars TAR_XZ,ASC,SHA256SUM renamed for generality.
Will help facilitate sane code when handling: archive formats, checksum file extensions, signature formats.
Diffstat (limited to 'libs')
-rwxr-xr-xlibs/common14
-rwxr-xr-xlibs/git4
-rwxr-xr-xlibs/project8
3 files changed, 13 insertions, 13 deletions
diff --git a/libs/common b/libs/common
index 6cd2dfe0..d0fd1203 100755
--- a/libs/common
+++ b/libs/common
@@ -39,9 +39,9 @@ DOTRNDSEED=".rndseed"
DOTVERSION=".version"
DOTREVISION=".revision"
DOTTARFILES=".tarfiles"
-TAR_XZ="tar.xz"
-SHA256SUM="sha256sum"
-ASC="asc"
+ARCHIVE="tar.xz"
+CHECKSUM="sha256sum"
+DSIG="asc"
function_check() {
local function=$1
@@ -93,7 +93,7 @@ path_wildcard_expand() {
file_checksum_create() {
local path=$1
- local checksum_path="$path.$SHA256SUM"
+ local checksum_path="$path.$CHECKSUM"
local name=$( basename "$path" )
local directory_path=$( dirname "$path" )
@@ -106,7 +106,7 @@ file_checksum_create() {
file_checksum_check() {
local path=$1
- local checksum_path="$path.$SHA256SUM"
+ local checksum_path="$path.$CHECKSUM"
local name=$( basename "$path" )
local directory_path=$( dirname "$path" )
@@ -125,7 +125,7 @@ file_checksum_check() {
file_signature_create() {
local path=$1
- local signature_path="$path.$ASC"
+ local signature_path="$path.$DSIG"
if [ -z "$RELEASE_KEY" ]
then
@@ -138,7 +138,7 @@ file_signature_create() {
file_signature_check() {
local path=$1
- local signature_path="$path.$ASC"
+ local signature_path="$path.$DSIG"
if ! [ -f "$signature_path" ]
then
diff --git a/libs/git b/libs/git
index a6509fc1..5869825d 100755
--- a/libs/git
+++ b/libs/git
@@ -579,7 +579,7 @@ git_project_release() {
if ! [ -z "$release_branch" ]
then
- local archive_path="$root/$RELEASE/$SOURCES/$project/$release_branch.$TAR_XZ"
+ local archive_path="$root/$RELEASE/$SOURCES/$project/$release_branch.$ARCHIVE"
local sources_path="$root/$SOURCES/$repository"
printf '%s\n' "Releasing sources archive for $project (with ${arguments:-no argument}) from "$repository" git"
@@ -620,7 +620,7 @@ git_project_release_check() {
if ! [ -z "$release_branch" ]
then
- local archive_path="$root/$RELEASE/$SOURCES/$project/$release_branch.$TAR_XZ"
+ local archive_path="$root/$RELEASE/$SOURCES/$project/$release_branch.$ARCHIVE"
file_exists_check "$archive_path"
diff --git a/libs/project b/libs/project
index babeb6bd..38e9b40d 100755
--- a/libs/project
+++ b/libs/project
@@ -425,7 +425,7 @@ project_sources_archive() {
path="$path-$argument"
fi
- local archive="$path.$TAR_XZ"
+ local archive="$path.$ARCHIVE"
if ! [ -f "$archive" ]
then
@@ -1056,7 +1056,7 @@ project_release_archive_path() {
path="$path-$argument"
done
- local archive_path="$release_path/$path.$TAR_XZ"
+ local archive_path="$release_path/$path.$ARCHIVE"
printf '%s\n' "$archive_path"
}
@@ -1076,7 +1076,7 @@ project_release_rootfs_path() {
path="$path-$argument"
done
- local rootfs_path="$release_path/$path.$TAR_XZ"
+ local rootfs_path="$release_path/$path.$ARCHIVE"
printf '%s\n' "$rootfs_path"
}
@@ -1109,7 +1109,7 @@ project_release_sources_archive_path() {
if ! [ -z "$release_path" ]
then
- local archive_path="$root/$RELEASE/$SOURCES/$project/$release_path.$TAR_XZ"
+ local archive_path="$root/$RELEASE/$SOURCES/$project/$release_path.$ARCHIVE"
printf '%s\n' "$archive_path"
fi