- fix installscript for sudo when root

diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am
index d05b3b8acdb4e83368c40403b482d97e22033de2..f658832b892cc69cbdc0cc0722a4ca4352a28587 100644 (file)
--- a/src/gns/nss/Makefile.am
+++ b/src/gns/nss/Makefile.am
@@ -54,10 +54,11 @@ libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
 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:

diff --git a/src/gns/nss/install-nss-plugin.sh b/src/gns/nss/install-nss-plugin.sh
index cbf352963c60802edc8fe9169effa32ba63421bd..293786bc5040a7905a2fbbfeed6c9505c40c1549 100755 (executable)
--- a/src/gns/nss/install-nss-plugin.sh
+++ b/src/gns/nss/install-nss-plugin.sh
@@ -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
+