Changeset 23248 for ipk/source.sh4/titanswapskins_tobayer01/CONTROL/preinst

Timestamp:

Sep 4, 2013, 2:35:59 AM (13 years ago)

Author:

tobayer

Message:

[titan] tobayer01 swapskin: change echo with escape to printf

File:

• ipk/source.sh4/titanswapskins_tobayer01/CONTROL/preinst (modified) (8 diffs)

ipk/source.sh4/titanswapskins_tobayer01/CONTROL/preinst

@@ -15 +15 @@
 ### FUNCTIONS ###
 
-RES_COL=60                                                                      # column number to place the status message
-MOVE_TO_COL="echo -en \\033[${RES_COL}G"        # command to move to the configured column number
+RES_COL=60                                                                      # column number to place the status
 
-echo_success() {                                                        # function to print the SUCCESS status
-        $MOVE_TO_COL; echo -n "[  OK  ]"; echo
+echo_success() {                                                        # function to print the OK status
+        printf "%-${RES_COL}s%s\n" "$1" "[  OK  ]"
 }
 
-echo_failure() {
-        $MOVE_TO_COL; echo -n "[FAILED]"; echo  # function to print the FAILED status message
+echo_failure() {                                                        # function to print the FAILED status
+        printf "%-${RES_COL}s%s\n" "$1" "[FAILED]"
 }
 
@@ -30 +29 @@
 ### MAIN ###
 
-echo -n "Checking box type..."
+msg="Checking box type..."
 if [ "$model" = "" ]; then
-        echo_failure
+        echo_failure "$msg"
         echo
         echo "Sorry, $plugin is not available for the $model!"
@@ -38 +37 @@
         exit 1
 else
-        echo_success
+        echo_success "$msg"
 fi
 
 
-echo -n "Checking installation directory..."
+msg="Checking installation directory..."
 if [ ! -d $plugin_target ]; then
-        echo_failure
+        echo_failure "$msg"
         echo
         echo "Sorry, $plugin_target not found!"
@@ -50 +49 @@
         exit 1
 else
-        echo_success
+        echo_success "$msg"
 fi
 
@@ -57 +56 @@
 SPACE=`getfreespace $plugin_target`
 FREE=`expr $SPACE - 100`
-echo -n "Checking free space ($plugin_size in $FREE kB)..."
+msg="Checking free space ($plugin_size in $FREE kB)..."
 if [ "$FREE" -lt "$plugin_size" ]; then
-        echo_failure
+        echo_failure "$msg"
         echo
         echo "Sorry, not enough free space in $plugin_target!"
@@ -65 +64 @@
         exit 1
 else
-        echo_success
+        echo_success "$msg"
 fi
 
 
-echo -n "Checking image type..."
+msg="Checking image type..."
 if [ `cat /etc/version | grep $buildgroup | wc -l` -eq 0 ]; then
-        echo_failure
+        echo_failure "$msg"
         echo
         echo "Sorry, $plugin is not available for this image type!"
@@ -77 +76 @@
         exit 1
 else
-        echo_success
+        echo_success "$msg"
 fi
 
@@ -83 +82 @@
 rm -rf $plugin_dir
 
-echo -n "Installing $plugin..."
-echo_success
+msg="Installing $plugin..."
+echo_success "$msg"
 
 exit 0