Forráskód Böngészése

Fixed a subtle login name bug by rearranging user name assignment in rc.

Michael Schloh von Bennewitz 23 éve
szülő
commit
fe4cf09fa5
2 módosított fájl, 10 hozzáadás és 6 törlés
  1. 2 2
      openpkg/openpkg.spec
  2. 8 4
      openpkg/rc

+ 2 - 2
openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020904
-%define       R_openpkg 20020904
+%define       V_openpkg 20020909
+%define       R_openpkg 20020909
 
 #   the used software versions
 %define       V_rpm     4.0.2

+ 8 - 4
openpkg/rc

@@ -181,18 +181,22 @@ else
 fi
 
 #   determine current run-time user
-user="$LOGNAME"
+user="`(whoami) 2>/dev/null | awk '{ printf("%s", $1); }'`"
 if [ ".$user" = . ]; then
-    user="$USER"
+    user="`(who am i) 2>/dev/null | awk '{ printf("%s", $1); }'`"
     if [ ".$user" = . ]; then
-        user="`(whoami) 2>/dev/null | awk '{ printf("%s", $1); }'`"
+        user="$LOGNAME"
+    fi
+    if [ ".$user" = . ]; then
+        echo "$0:ERROR: unable to determine current username" 1>&2
         if [ ".$user" = . ]; then
-            user="`(who am i) 2>/dev/null | awk '{ printf("%s", $1); }'`"
+            user="$USER"
             if [ ".$user" = . ]; then
                 echo "$0:ERROR: unable to determine current username" 1>&2
                 exit 1
             fi
         fi
+        exit 1
     fi
 fi