Răsfoiți Sursa

Add -V option to show version to void-mk{live,rootfs} and installer in the title.

Juan RP 11 ani în urmă
părinte
comite
112a6a7775
3 a modificat fișierele cu 9 adăugiri și 4 ștergeri
  1. 1 1
      installer.sh.in
  2. 5 1
      mklive.sh.in
  3. 3 2
      mkrootfs.sh.in

+ 1 - 1
installer.sh.in

@@ -84,7 +84,7 @@ WIDGET_SIZE="10 70"
 DIALOG() {
     rm -f $ANSWER
     dialog --colors --keep-tite --no-shadow --no-mouse \
-        --backtitle "${BOLD}${WHITE}Void Linux installation -- http://www.voidlinux.eu/${RESET}" \
+        --backtitle "${BOLD}${WHITE}Void Linux installation -- http://www.voidlinux.eu/ (@@MKLIVE_VERSION@@)${RESET}" \
         --cancel-label "Back" --aspect 20 "$@" 2>$ANSWER
     return $?
 }

+ 5 - 1
mklive.sh.in

@@ -29,6 +29,8 @@
 set -E
 trap "echo; error_out $LINENO $?" INT TERM HUP ERR
 
+readonly PROGNAME=$(basename $0)
+
 info_msg() {
     printf "\033[1m$@\n\033[m"
 }
@@ -110,6 +112,7 @@ Options:
                     current working directory will be used).
  -o outfile         Output file name for the ISO image.
  -s splash          Splash image file for isolinux.
+ -V                 Show version.
 _EOF
     exit 1
 }
@@ -263,7 +266,7 @@ generate_iso_image() {
 #
 # main()
 #
-while getopts "C:c:l:o:r:s:h" opt; do
+while getopts "C:c:l:o:r:s:hV" opt; do
     case $opt in
         C) CONFIG_FILE="$OPTARG";;
         c) COMPRESSTYPE="$OPTARG";;
@@ -272,6 +275,7 @@ while getopts "C:c:l:o:r:s:h" opt; do
         r) ROOTDIR="$OPTARG";;
         s) SPLASH_IMAGE="$OPTARG";;
         h) usage;;
+        V) echo "$PROGNAME @@MKLIVE_VERSION@@"; exit 0;;
     esac
 done
 shift $(($OPTIND - 1))

+ 3 - 2
mkrootfs.sh.in

@@ -41,7 +41,7 @@ die() {
 }
 
 usage() {
-    echo "Usage: $PROGNAME [-a raspberrypi]"
+    echo "Usage: $PROGNAME [-a raspberrypi] [-V]"
 }
 
 run_cmd() {
@@ -72,10 +72,11 @@ register_binfmt() {
 #
 # main()
 #
-while getopts "a:h" opt; do
+while getopts "a:hV" opt; do
     case $opt in
         a) TARGET_ARCH="$OPTARG";;
         h) usage; exit 0;;
+        V) echo "$PROGNAME @@MKLIVE_VERSION@@"; exit 0;;
     esac
 done
 shift $(($OPTIND - 1))