X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=mymk-basefile;h=d2b4328792fd3f53129c80dc6093f164e6cb796f;hb=HEAD;hp=62f2924bfbb2431d13bff7ca8530accdb914fdca;hpb=839b3cf02ad7e8900b3d685d54449f11e7b60b60;p=automated-distro-installer

diff --git a/mymk-basefile b/mymk-basefile
index 62f2924..1f32665 100755
--- a/mymk-basefile
+++ b/mymk-basefile
@@ -16,12 +16,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
-script_dir="${x%/*}"
+set -e; . /usr/local/lib/bash-bear; set +e
+
+this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+readonly this_file this_dir="${this_file%/*}"
+cd "$this_dir"
 
 usage() {
-  cat <<EOF
-Usage: ${0##*/} [-h|--help] [mk-basefile_args]
+  cat <<'EOF'
+Usage: mymk-basefile [-h|--help] [mk-basefile_args]
 Wrap fai's mk-basefile so output dir is $BASEFILE_DIR if it exists.
 
 And fix things for trisquel. mk-basefile has a trisquel mirror added.
@@ -32,6 +35,7 @@ them often. Better to build our all our own.
 
 Args I've used before:
 
+-z BOOKWORM64
 -z BULLSEYE64
 -z BUSTER64
 -z STRETCH64
@@ -50,8 +54,8 @@ Note: Uses GNU getopt options parsing style.
 Usage of mk-basefile:
 
 EOF
-  $script_dir/fai/config/basefiles/mk-basefile -h
-  exit $1
+  $this_dir/fai/config/basefiles/mk-basefile -h
+  exit 0
 }
 
 case $1 in
@@ -82,4 +86,4 @@ fi
 if awk '$2 == "/tmp" && $4 ~ /nodev/' /proc/mounts | grep -q . || [[ $? == 141 ]]; then
   $s mount -o remount,dev /tmp
 fi
-$s $script_dir/fai/config/basefiles/mk-basefile "$@"
+$s $this_dir/fai/config/basefiles/mk-basefile "$@"