summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Schipp <jonschipp@gmail.com>2014-07-21 15:36:22 -0500
committerDaniel Borkmann <dborkman@redhat.com>2014-07-22 21:27:22 +0200
commitfc0b91758c976de050cf6fc9e905ab677e79c946 (patch)
tree9a396009d596fe7436896929729c12ea9fbe9f21
parent46b0ace509d9ed013915e9ab8013c7c712e11395 (diff)
nacl_build.sh: use portable way of entering previous directory
While writing a puppet manifest to provision netsniff-ng on a server. I encountered the following shell warnings: Notice: /Stage[main]/Netsniff_ng::Install/Exec[Install Netsniff-NG]/returns: Building NaCl for arch amd64 on host localhost (grab a coffee, this takes a while) ... Notice: /Stage[main]/Netsniff_ng::Install/Exec[Install Netsniff-NG]/returns: ./nacl_build.sh: line 41: cd: /root/netsniff-ng/curvetun: No such file or directory Notice: /Stage[main]/Netsniff_ng::Install/Exec[Install Netsniff-NG]/returns: NaCl lib path /root/nacl/nacl-20110221/build/localhost/lib/amd64 Notice: /Stage[main]/Netsniff_ng::Install/Exec[Install Netsniff-NG]/returns: NaCl include path /root/nacl/nacl-20110221/build/localhost/include/amd64 Notice: /Stage[main]/Netsniff_ng::Install/Exec[Install Netsniff-NG]/returns: ./nacl_build.sh: line 49: ./nacl_path.sh: No such file or directory They went away after I applied this patch. Signed-off-by: Jon Schipp <jonschipp@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
-rwxr-xr-xcurvetun/nacl_build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/curvetun/nacl_build.sh b/curvetun/nacl_build.sh
index df6027a..d9ea752 100755
--- a/curvetun/nacl_build.sh
+++ b/curvetun/nacl_build.sh
@@ -38,7 +38,7 @@ echo "Building NaCl for arch $arch on host $shorthostname (grab a coffee, this t
cd "$nacl_build_dir"/"$nacl_version"
./do
-cd - > /dev/null
+cd $OLDPWD > /dev/null
nacl_lib_path="$nacl_build_dir/$nacl_version/build/$shorthostname/lib/$arch"
nacl_include_path="$nacl_build_dir/$nacl_version/build/$shorthostname/include/$arch"