Commit 66d59f08aecb72e3fa2f1785a9b18a7857bcc86c
Parent: ffa2e5dbbb09f1fe76fec040bc3aa4a07049d1bf
Author: mcol <mcol@posteo.net>
Date: 2020-07-01 11:14:37 +0100
Committer: mcol <mcol@posteo.net>
Committed: 2020-07-01 11:14:37 +0100

fix regex to work with ash

install/welcome Modified

@@ -8,15 +8,21 @@
 
         [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf
 
-	is_int() { [[ $1 =~ ^-?[0-9]+$ ]]; }
-	is_int $WELCOME_FG || error "welcome: WELCOME_FG should be an integer" && exit 1
-	is_int $WELCOME_BG || error "welcome: WELCOME_BG should be an integer" && exit 1
-	is_int $WELCOME_IN || error "welcome: WELCOME_IN should be an integer" && exit 1
+	is_int() { test "$1" -ge 0 -a "$1" -le 15; }
+	is_int $WELCOME_FG || exit 1
+	is_int $WELCOME_BG || exit 1
+	is_int $WELCOME_IN || exit 1
 
 	echo "WELCOME_FG=$WELCOME_FG" >> "$BUILDROOT/welcome"
 	echo "WELCOME_BG=$WELCOME_BG" >> "$BUILDROOT/welcome"
 	echo "WELCOME_IN=$WELCOME_IN" >> "$BUILDROOT/welcome"
-    ) &&  add_runscript
+
+    ) || {
+	echo "welcome: /etc/vconsole.conf configuration error"
+	exit 1
+    }
+
+    add_runscript
 }
 
 help() {