diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-08-03 14:00:04 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-08-03 14:00:04 +0000 |
commit | 2aab65fd2faa1a83a64888c79813b8cb646a1f77 (patch) | |
tree | 6d0b190ae310446a0daa82db682355a97f7ab9b3 /src/gns/nss | |
parent | 042343d4ea2fa5dc1380ee92b4f2808ef0028843 (diff) | |
download | gnunet-2aab65fd2faa1a83a64888c79813b8cb646a1f77.tar.gz gnunet-2aab65fd2faa1a83a64888c79813b8cb646a1f77.zip |
- fix installscript for sudo when root
Diffstat (limited to 'src/gns/nss')
-rw-r--r-- | src/gns/nss/Makefile.am | 3 | ||||
-rwxr-xr-x | src/gns/nss/install-nss-plugin.sh | 18 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am index d05b3b8ac..f658832b8 100644 --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am | |||
@@ -54,10 +54,11 @@ libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS) | |||
54 | if !MINGW | 54 | if !MINGW |
55 | if HAVE_SUDO | 55 | if HAVE_SUDO |
56 | install-data-hook: | 56 | install-data-hook: |
57 | $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SUDO_BINARY) $(SHELL) $(top_builddir) $(nssdir) | 57 | $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(nssdir) $(SUDO_BINARY) |
58 | 58 | ||
59 | uninstall-hook: | 59 | uninstall-hook: |
60 | $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SUDO_BINARY) $(nssdir) | 60 | $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SUDO_BINARY) $(nssdir) |
61 | |||
61 | endif | 62 | endif |
62 | else | 63 | else |
63 | install-data-hook: | 64 | install-data-hook: |
diff --git a/src/gns/nss/install-nss-plugin.sh b/src/gns/nss/install-nss-plugin.sh index cbf352963..293786bc5 100755 --- a/src/gns/nss/install-nss-plugin.sh +++ b/src/gns/nss/install-nss-plugin.sh | |||
@@ -1,13 +1,9 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # $1 - sudo binary (empty if root) | 2 | # $1 - shell |
3 | # $2 - shell | 3 | # $2 - top_builddir |
4 | # $3 - top_builddir | 4 | # $3 - nssdir |
5 | # $4 - nssdir | 5 | # $4 - sudo binary (empty if root) |
6 | if [ "`whoami`" = "root" ]; then | 6 | $4 $1 $2/libtool --finish $3 |
7 | $1 $2/libtool --finish $3 | 7 | $4 rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la |
8 | rm -f $3/libnss_gns.la $3/libnss_gns4.la $3/libnss_gns6.la | 8 | |
9 | else | ||
10 | $1 $2 $3/libtool --finish $4 | ||
11 | $1 rm -f $4/libnss_gns.la $4/libnss_gns4.la $4/libnss_gns6.la | ||
12 | fi | ||
13 | 9 | ||