[GNUnet-SVN] r23064 - gnunet/src/gns/nss

[gnunet]

Author: bartpolot
Date: 2012-08-03 16:00:04 +0200 (Fri, 03 Aug 2012)
New Revision: 23064

Modified:
   gnunet/src/gns/nss/Makefile.am
   gnunet/src/gns/nss/install-nss-plugin.sh
Log:
- fix installscript for sudo when root

Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2012-08-03 13:56:39 UTC (rev 23063)
+++ gnunet/src/gns/nss/Makefile.am      2012-08-03 14:00:04 UTC (rev 23064)
@@ -54,10 +54,11 @@
 if !MINGW
 if HAVE_SUDO
 install-data-hook:
-       $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SUDO_BINARY) $(SHELL) 
$(top_builddir) $(nssdir)
+       $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) 
$(top_builddir) $(nssdir) $(SUDO_BINARY)
 
 uninstall-hook:
        $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SUDO_BINARY) 
$(nssdir)
+
 endif  
 else
 install-data-hook:

Modified: gnunet/src/gns/nss/install-nss-plugin.sh
===================================================================
--- gnunet/src/gns/nss/install-nss-plugin.sh    2012-08-03 13:56:39 UTC (rev 
23063)
+++ gnunet/src/gns/nss/install-nss-plugin.sh    2012-08-03 14:00:04 UTC (rev 
23064)
@@ -1,13 +1,9 @@
 #!/bin/bash
-# $1 - sudo binary (empty if root)
-# $2 - shell
-# $3 - top_builddir
-# $4 - nssdir
-if [ "`whoami`" = "root" ]; then
-  $1 $2/libtool --finish $3
-  rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la
-else
-  $1 $2 $3/libtool --finish $4
-  $1 rm -f $4/libnss_gns.la $4/libnss_gns4.la $4/libnss_gns6.la
-fi
+# $1 - shell
+# $2 - top_builddir
+# $3 - nssdir
+# $4 - sudo binary (empty if root)
+$4 $1 $2/libtool --finish $3
+$4 rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la
 
+