Changeset 15926 in vbox

Timestamp:

Jan 13, 2009 8:58:15 PM (16 years ago)

Author:

vboxsync

Message:

Installers/Linux: cosmetic patch for init scripts for ArchLinux, contributed by ColdShine

Location:

trunk/src/VBox/Additions/linux/installer

Files:

• vboxadd-timesync.sh (modified) (10 diffs)
• vboxadd.sh (modified) (2 diffs)

trunk/src/VBox/Additions/linux/installer/vboxadd-timesync.sh

@@ -46 +46 @@
     system=gentoo
     PIDFILE="/var/run/vboxadd-timesync"
- elif [ -f /etc/arch-release ]; then
+elif [ -f /etc/arch-release ]; then
      system=arch
      PIDFILE="/var/run/vboxadd-timesync"
@@ -70 +70 @@
         echo
     }
+
+    begin() {
+        echo -n "$1"
+    }
 fi
 
@@ -87 +91 @@
         rc_status -v
     }
+
+    begin() {
+        echo -n "$1"
+    }
 fi
 
@@ -104 +112 @@
     succ_msg() {
         echo " ...done."
+    }
+
+    begin() {
+        echo -n "$1"
     }
 fi
@@ -125 +137 @@
     }
 
+    begin() {
+        echo -n "$1"
+    }
+
     if [ "`which $0`" = "/sbin/rc" ]; then
         shift
@@ -131 +147 @@
 
 if [ "$system" = "arch" ]; then
+    USECOLOR=yes
     . /etc/rc.d/functions
     daemon() {
@@ -143 +160 @@
 
     fail_msg() {
-        echo " ...fail!"
-    }
-
-    succ_msg() {
-        echo " ...done."
+        stat_fail
+    }
+
+    succ_msg() {
+        stat_done
     }
 fi
@@ -153 +170 @@
 if [ "$system" = "slackware" ]; then
     daemon() {
-        $1 $2
+        $1 $2
     }
 
@@ -207 +224 @@
 start() {
     if ! test -f $PIDFILE; then
-        echo -n "Starting VirtualBox host to guest time synchronization ";
+        begin "Starting VirtualBox host to guest time synchronization ";
         vboxaddrunning || {
             echo "VirtualBox Additions module not loaded!"
@@ -222 +239 @@
 stop() {
     if test -f $PIDFILE; then
-        echo -n "Stopping VirtualBox host to guest time synchronisation ";
+        begin "Stopping VirtualBox host to guest time synchronisation ";
         vboxaddrunning || {
             echo "VirtualBox Additions module not loaded!"

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -36 +36 @@
 LOG="/var/log/vboxadd-install.log"
 
-if [ -f /etc/redhat-release ]; then
+if [ -f /etc/arch-release ]; then
+    system=arch
+elif [ -f /etc/redhat-release ]; then
     system=redhat
 elif [ -f /etc/SuSE-release ]; then
@@ -44 +46 @@
 else
     system=other
+fi
+
+if [ "$system" = "arch" ]; then
+    USECOLOR=yes
+    . /etc/rc.d/functions
+    fail_msg() {
+        stat_fail
+    }
+
+    succ_msg() {
+        stat_done
+    }
+
+    begin() {
+        stat_busy "$1"
+    }
 fi