From 1f4c66e32435b28622e2bb9ca4c07289bdaee402 Mon Sep 17 00:00:00 2001 From: anadahz Date: Wed, 10 May 2017 17:52:36 +0000 Subject: [PATCH] Do not sign non existent torrent file, add update version in MOTD * Remove torrent file reference from sign script * Add lepidopter update version number in MOTD --- lepidopter-fh/etc/update-motd.d/50-lepidopter | 10 ++++++---- scripts/lepidopter-sign.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lepidopter-fh/etc/update-motd.d/50-lepidopter b/lepidopter-fh/etc/update-motd.d/50-lepidopter index 1a78d01..686caa6 100755 --- a/lepidopter-fh/etc/update-motd.d/50-lepidopter +++ b/lepidopter-fh/etc/update-motd.d/50-lepidopter @@ -5,6 +5,7 @@ IMAGE_DOC_URL="https://github.com/TheTorProject/lepidopter/blob/master/README.md" IMAGE_SOURCE_URL="https://github.com/TheTorProject/lepidopter" KERNEL_VERSION=$(uname -r) +LEPIDOPTER_UPDATE_VERSION=$(cat /etc/lepidopter-update/version) [ -r /etc/lsb-release ] && . /etc/lsb-release if [ -z "$DISTRIB_DESCRIPTION" ] && [ -x /usr/bin/lsb_release ]; then @@ -31,10 +32,11 @@ printf "Welcome on %s (%s %s %s %s)\n" "$(hostname)" "${DISTRIB_DESCRIPTION}" \ printf "\n" printf "System information as of: %s\n" "$date" #printf "\n" -printf "Memory usage:\t%s\t\tInt IP Address:\t%s\n" "$memory_usage" "$ip" -printf "System load:\t%s\t\tSystem uptime:\t%s\n" "$load" "$time" -printf "Avail Space:\t%s\t\tImage build:\t%s\n" "$root_usage" "$LEPIDOPTER_BUILD" -printf "Local Users:\t%s\t\tProcesses:\t%s\n" $users $processes +printf "Update version:\t%s\t\tInt. IP Address: %s\n" "$LEPIDOPTER_UPDATE_VERSION" "$ip" +printf "Memory usage:\t%s\t\tSystem uptime:\t %s\n" "$memory_usage" "$time" +printf "System load:\t%s\t\tImage build:\t %s\n" "$load" "$LEPIDOPTER_BUILD" +printf "Avail. Space:\t%s\t\tProcesses:\t %s\n" "$root_usage" "$processes" +printf "Local Users:\t%s\n" "$users" printf "\n" printf "Documentation:\t%s\n" "$IMAGE_DOC_URL" printf "Image source:\t%s\n" "$IMAGE_SOURCE_URL" diff --git a/scripts/lepidopter-sign.sh b/scripts/lepidopter-sign.sh index 7ffeb4f..73e2894 100755 --- a/scripts/lepidopter-sign.sh +++ b/scripts/lepidopter-sign.sh @@ -11,7 +11,7 @@ sha256sum *.img.{xz,zip} > SHA256SUM sha512sum *.img.{xz,zip} > SHA512SUM echo "Signing..." -for f in *.img.{xz,zip} SHA*SUM *.torrent; do +for f in *.img.{xz,zip} SHA*SUM; do gpg2 --verbose --armor --default-key ${LEPIDOPTER_SIGN_KEY} --detach-sign $f done