X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fresize;h=4f2ef49854b087f53d1ae0d961747cc2f752df6a;hp=450982310ffa4061582879f09e8b6de955f071c2;hb=HEAD;hpb=7f77555b3d92709034fe41919358053c650c71e1

diff --git a/fresize b/fresize
index 4509823..a7df414 100755
--- a/fresize
+++ b/fresize
@@ -1,56 +1,12 @@
 #!/bin/bash
 
-shopt -s extdebug
-bash-trace() {
-    # shows function args when: shopt -s extdebug
-    local -i argc_index=0 arg frame i start=${1:-1} max_indent=8 indent
-    local source
-    local extdebug=false
-    if [[ $(shopt -p extdebug) == *-s* ]]; then
-        extdebug=true
-    fi
-
-    for ((frame=0; frame < ${#FUNCNAME[@]}-1; frame++)); do
-        argc=${BASH_ARGC[frame]}
-        argc_index+=$argc
-        ((frame < start)) && continue
-        if (( ${#BASH_SOURCE[@]} > 1 )); then
-            source="${BASH_SOURCE[frame+1]}:${BASH_LINENO[frame]}:"
-        fi
-        indent=$((frame-start+1))
-        indent=$((indent < max_indent ? indent : max_indent))
-        printf "%${indent}s↳%sin \`%s" '' "$source" "${FUNCNAME[frame]}"
-        if $extdebug; then
-            for ((i=argc_index-1; i >= argc_index-argc; i--)); do
-                printf " %s" "${BASH_ARGV[i]}"
-            done
-        fi
-        echo \'
-    done
-}
-
-
-errcatch() {
-    set -E; shopt -s extdebug
-    _err-trap() {
-        err=$?
-        exec >&2
-        echo "${BASH_SOURCE[1]}:${BASH_LINENO[0]}:in \`$BASH_COMMAND' returned $err"
-        bash-trace 2
-        echo "$0: exiting with code $err"
-        exit $err
-    }
-    trap _err-trap ERR
-    set -o pipefail
-}
-
-errcatch
-
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+
 usage() {
     cat <<EOF
-Usage: ${0##*/} [OPTIONS] +/-SIZE[g] swap|boot
+Usage: ${0##*/} [OPTIONS] -- +/-SIZE[g] swap|boot
 
 Assuming Ian Kelling's partition scheme and we are currently into one of
 it's encrypted oses (we it's btrfs filesystem to be mounted), resize