diff options
| author | Simon Rettberg | 2019-03-28 09:57:21 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-03-28 09:57:21 +0100 |
| commit | 0c866dd8933971da0568958e7caa2693df37bd89 (patch) | |
| tree | 491e477621be340137da6fb7f3de4e4be122625d | |
| parent | [SSPS] slx-admin boot: Also log non-critical messages (diff) | |
| download | setup-scripts-0c866dd8933971da0568958e7caa2693df37bd89.tar.gz setup-scripts-0c866dd8933971da0568958e7caa2693df37bd89.tar.xz setup-scripts-0c866dd8933971da0568958e7caa2693df37bd89.zip | |
[SSUS] Require manual --version spec
| -rwxr-xr-x | satellit_upgrader/pack-update.sh | 10 | ||||
| -rw-r--r-- | satellit_upgrader/updater.template.sh | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/satellit_upgrader/pack-update.sh b/satellit_upgrader/pack-update.sh index a485baf..a44265e 100755 --- a/satellit_upgrader/pack-update.sh +++ b/satellit_upgrader/pack-update.sh @@ -104,12 +104,17 @@ readonly RED GREEN RESET cp "updater.template.sh" "$UPDATER" || perror "could not copy template" chmod +x "$UPDATER" +VERSION= LEAN= while true; do case "$1" in --lean|-l) LEAN=true ;; + --version) + shift + VERSION="$1" + ;; *) break ;; @@ -117,6 +122,9 @@ while true; do shift done +[ -z "$VERSION" ] && perror "No --version given" +[[ "$VERSION" =~ ^v[0-9]\.[0-9][a-z]?$ ]] || echo "${RED}Warn${RESET}: Version format is not vX.X(y)" + # Prepare source directory declare -rg SRCDIR=$1 if [ -z "$SRCDIR" ]; then @@ -185,7 +193,7 @@ if [ -e "$TGZ_SLXADMIN" ]; then [ -n "$VERS" ] || perror "Could not extract slx-admin version!" echo "Version: $VERS" sed -i "s/%TARGET_WEBIF_VERSION%/${VERS}/" "$UPDATER" || perror "could not patch slxadmin version in updater" - sed -i "s/%SLXADMIN_FOOTER%/$(date '+%y-%m-%d %H:%M')/" "$UPDATER" || perror "could not patch slxadmin footer in updater" + sed -i "s/%SLXADMIN_FOOTER%/${VERSION}/" "$UPDATER" || perror "could not patch slxadmin footer in updater" patchtgz "TGZ_SLXADMIN" "$TGZ_SLXADMIN" else echo "${RED}no${RESET}" diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh index bfc434c..478ce81 100644 --- a/satellit_upgrader/updater.template.sh +++ b/satellit_upgrader/updater.template.sh @@ -329,10 +329,7 @@ if [ -n "$TGZ_SLXADMIN" ]; then FOOTER="$SLXADMIN_FOOTER" [[ "$FOOTER" == %*% ]] && FOOTER= if [ -z "$FOOTER" ]; then - D=$(stat -c %Y "$0") - [ -z "$D" ] && D=$(date +%s) - D=$(date -d "@$D" "+%y-%m-%d %H:%M") - FOOTER="Unknown $D" + FOOTER="Build $TARGET_WEBIF_VERSION" fi FOOTER="$OLDFOOTER [Update: ${FOOTER}]" sed -i "s#^.*define.*CONFIG_FOOTER.*\$#define('CONFIG_FOOTER', '${FOOTER}');#" "${PATH_SLXADMIN}/config.php" |