diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-07-19 23:43:25 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-07-19 23:43:25 +0000 |
| commit | 7bb8bc69fecb0a37c6ef58817ecba379e81bf702 (patch) | |
| tree | c3954528f57deb1f29be8eb14d80bf1572e9f80d /bin | |
| parent | Fix a missed space in the installer script. (diff) | |
| download | gli-7bb8bc69fecb0a37c6ef58817ecba379e81bf702.tar.gz gli-7bb8bc69fecb0a37c6ef58817ecba379e81bf702.tar.bz2 gli-7bb8bc69fecb0a37c6ef58817ecba379e81bf702.zip | |
Added launch variable to the end of each try-run with auth, which should cause this to function properly. Of course, more testing is needed.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1478 f8877401-5920-0410-a79b-8e2d7e04ca0d
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/installer | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/installer b/bin/installer index 13a5a12..c187336 100755 --- a/bin/installer +++ b/bin/installer @@ -1,6 +1,6 @@ #!/bin/bash # -# $Header: /var/cvsroot/gentoo/src/installer/bin/installer,v 1.3 2006/07/19 23:34:24 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/installer/bin/installer,v 1.4 2006/07/19 23:43:25 wolf31o2 Exp $ # # This is the installer script that we will use to determine whether or not # we are running in X or as root. A good portion of this script was ripped @@ -56,19 +56,19 @@ if [ "$auth" -eq 0 ]; then GOT_ROOT=`id -u` if [ "$GOT_ROOT" != "0" ]; then # first we try sudo - try_run /usr/bin/sudo env DISPLAY=":0.0" su -c "$installer_root/bin/installer -auth" + try_run /usr/bin/sudo env DISPLAY=":0.0" su -c "$installer_root/bin/installer -auth ${launch}" status="$?" if [ "$status" -eq 0 ]; then exit 0 elif [ "$status" -eq 1 ]; then - try_run /usr/bin/gnomesu -u root -c "sh $installer_root/bin/installer -auth" + try_run /usr/bin/gnomesu -u root -c "sh $installer_root/bin/installer -auth ${launch}" status="$?" # If try_run successfully executed gnomesu, it will return gnomesu's # exit code. if [ "$status" -eq 0 ]; then exit 0 elif [ "$status" -eq 1 ]; then - try_run /usr/bin/xsu -e -a -u root -c "sh $installer_root/bin/installer -auth" + try_run /usr/bin/xsu -e -a -u root -c "sh $installer_root/bin/installer -auth ${launch}" status="$?" # xsu returns 2 if ran and cancelled (i.e. the user 'doesn't # want' to auth). it will return 0 if the command was executed @@ -82,7 +82,7 @@ if [ "$auth" -eq 0 ]; then # $status is 2 echo "You need to run this installation as the super user." echo "Please enter the root password." - try_run /bin/su root -c "export DISPLAY=$DISPLAY;sh $installer_root/bin/installer -auth" + try_run /bin/su root -c "export DISPLAY=$DISPLAY;sh $installer_root/bin/installer -auth ${launch}" status="$?" if [ "$status" -eq 0 ]; then # the auth command was properly executed |