From: Ian Kelling <iank@fsf.org>
Date: Mon, 18 Dec 2023 21:02:51 +0000 (-0500)
Subject: make dependency require manual install
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=e8a09e0816f17de27453105109ebcc91e5f01c58;p=newns

make dependency require manual install
---

diff --git a/newns b/newns
index 2290629..315c786 100755
--- a/newns
+++ b/newns
@@ -16,20 +16,9 @@
 
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
-tmp="$(readlink -f "${BASH_SOURCE}")"; script_dir="${tmp%/*}"
-if [[ ! $ERRHANDLE_PATH ]]; then
-  ERRHANDLE_PATH="$script_dir"/../errhandle/err
-fi
-if [[ -s $ERRHANDLE_PATH ]]; then
-  source $ERRHANDLE_PATH
-else
-  cd "$script_dir"
-  if ! wget -O err 'https://iankelling.org/git/?p=errhandle;a=blob_plain;f=err;hb=HEAD'; then
-    echo "$0: failed to get errhandle dependency" >&2
-    exit 1
-  fi
-  source err
-fi
+# https://savannah.nongnu.org/projects/bash-bear-trap/
+set -e; . /usr/local/lib/bash-bear; set +e
+
 
 usage() {
   cat <<EOF
@@ -72,13 +61,9 @@ files, so the mount namespace won't be needed for most use cases, and I
 will update the script to that the mount namespace not created unless a
 flag is passed in. Patch welcome to add that flag before then.
 
-This script has a dependency which you can download manually or it
-will be automatically downloaded into the same directory.
-It handles errors by printing stack trace and and cleaning up the namespaces.
-To download manually,
-git clone https://iankelling.org/git/errhandle
-into an adjacent directory, or
-export ERRHANDLE_PATH to point to the 'err' file in that repo.
+
+This script has a dependency
+https://savannah.nongnu.org/projects/bash-bear-trap/ . Search the script for "source" to see where to install or modify the  installed location.
 
 
 Background on this project (you can skip if you like):