[SM-Commit] GIT changes to stable-0.4 grimoire by Jaka Kranjc (424830248eed0cf44da11d9d53399c9fb633cefa)

Jaka Kranjc scm at mail.sourcemage.org
Tue Jan 2 05:12:43 EST 2007


GIT changes to stable-0.4 grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 smgl/simpleinit-msb/HISTORY |    3 +++
 smgl/simpleinit-msb/telinit |   10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 424830248eed0cf44da11d9d53399c9fb633cefa
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    simpleinit-msb: fix #12859
    
    shize!
    
    Conflicts:
    
    	smgl/simpleinit-msb/HISTORY

diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index e999dda..a97546d 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,6 @@
+2006-07-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* telinit: shize! sh-ise; patch from sqweek #12859
+
 2006-02-08 Eric Sandall <eric at sandall.us>
 	* DEPENDS: Depends on smgl-fhs (for directory structure)
 
diff --git a/smgl/simpleinit-msb/telinit b/smgl/simpleinit-msb/telinit
index 9a86799..36226f7 100755
--- a/smgl/simpleinit-msb/telinit
+++ b/smgl/simpleinit-msb/telinit
@@ -21,19 +21,17 @@ perm=$?  #0 if writing to /dev/initctl i
 INIT_ROOT=""
 PRE_PATH=""
 
-if [ $UID != 0 ]; then
+if [ `id -u` != 0 ]; then
 	echo "Enter the root password, please."
 	exec su - -c "DISPLAY=$DISPLAY PATH=$PATH $0 $*"
 fi
 
-if [ z"$1" == z"--" ]; then shift 1; fi
+if [ z"$1" = z"--" ]; then shift 1; fi
 
 get_inittab_entry()
 {
-#  sed -n s/$'^[ \r\t]*'${1}$'[ \r\t]*=*[ \r\t]*''\('$'[^ \r\t]*''\).*$/\1/p' <$INIT_ROOT/etc/inittab
-
-  #echo before cat to get initial newline because the regex needs it
-  expr "`echo ; cat $INIT_ROOT/etc/inittab`" : $'.*\n[ \r\t]*'${1}$'[ \r\t]*=*[ \r\t]*''\('$'[^ \r\t\n]*''\).*' 
+  #Hard tabs for maximum sh/sed compatibility!
+  sed -n 's/^[ 	]*'"$1"'[ 	]*[ 	=][ 	]*//p' $INIT_ROOT/etc/inittab
 }
 
 



More information about the SM-Commit mailing list