From 0d9ef0de928d21cd0104a73d1748b1c174e5b3cf Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sun, 13 Mar 2022 05:31:38 +0000 Subject: Whitespace --- bootstrap.sh | 310 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 159 insertions(+), 151 deletions(-) (limited to 'bootstrap.sh') diff --git a/bootstrap.sh b/bootstrap.sh index d37ef6a..09b8cd6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -29,165 +29,173 @@ ### Main entry point main() { - ## Sanity checking - # Since bootstrap.sh does some naive path-mangling, let's show an error - # if it's not run correctly. Yes, there are other ways to run a - # script. But this script should ideally be run, like, one time. Also - # you can obviously comment this out or change it if you know what - # you're doing! - - case "$0" in - ./*) ;; # this is the way bootstrap.sh /should/ be run. - *) - printf >&2 'Weird invocation! %s\n' "$*" - printf >&2 'Try: cd ; ./bootstrap.sh\n' - exit 127 - ;; - esac - - ## Variables - - # option: -d/--dry-run - : "${BOOTSTRAP_ACTION:=link}" - # option: -v/--verbose - : "${BOOTSTRAP_DEBUG:=false}" - # option: -k/--keep-going - : "${BOOTSTRAP_QUIT_ON_ERROR:=true}" - # option: -m/--manifest FILE - : "${BOOTSTRAP_MANIFEST_FILE:=bootstrap.manifest}" - # option: -- (rest are passed to ln) - : "${BOOTSTRAP_LN_ARGS:=-s}" - - ## Handle command-line flags - # Basically an easier way of setting the above variables. - while [ -n "$1" ]; do - case "$1" in - -h|--help) - cat >&2 <&2 'Weird invocation! %s\n' "$*" + printf >&2 'Try: cd ; ./bootstrap.sh\n' + exit 127 + ;; + esac + + ## Variables + + # option: -d/--dry-run + : "${BOOTSTRAP_ACTION:=link}" + # option: -v/--verbose + : "${BOOTSTRAP_DEBUG:=false}" + # option: -k/--keep-going + : "${BOOTSTRAP_QUIT_ON_ERROR:=true}" + # option: -m/--manifest FILE + : "${BOOTSTRAP_MANIFEST_FILE:=bootstrap.manifest}" + # option: -- (rest are passed to ln) + : "${BOOTSTRAP_LN_ARGS:=-s}" + + ## Handle command-line flags + # Basically an easier way of setting the above variables. + while [ -n "$1" ]; do + case "$1" in + -h|--help) + cat >&2 <&2 "Bad argument: '$2'" - exit 129 - ;; - esac - BOOTSTRAP_MANIFEST_FILE="$2" - shift 2 - ;; - -f|--force) - BOOTSTRAP_LN_ARGS="$BOOTSTRAP_LN_ARGS -f" - shift 1 - ;; - --) - BOOTSTRAP_LN_ARGS="$@" - break - ;; - esac - done - - ## Main loop - while IFS=' ' read -r source destination; do - # Ignore lines beginning with '#' - case "$source" in - '#'*) - if "$BOOTSTRAP_DEBUG"; then - printf >&2 'Skipping comment: %s %s\n' \ - "$source" "$destination" - fi - continue - ;; - esac - - # Ignore empty lines, or lines with only SOURCE or DESTINATION - if [ -z "$source" ] || [ -z "$destination" ]; then - if "$BOOTSTRAP_DEBUG"; then - printf >&2 'Skipping line: %s\t%s\n' \ - "$source" "$destination" - fi - continue - fi - - # Do the thing - if ! dispatch "$source" "$destination"; then - printf >&2 'ERROR: %s -> %s\n' \ - "$source" "$destination" - if "$BOOTSTRAP_QUIT_ON_ERROR"; then - exit "$dispatch_error" - fi - fi - done < "$BOOTSTRAP_MANIFEST_FILE" + exit + ;; + -d|--dry-run) + BOOTSTRAP_ACTION=print + shift 1 + ;; + -v|--verbose) + BOOTSTRAP_DEBUG=true + shift 1 + ;; + -k|--keep-going) + BOOTSTRAP_QUIT_ON_ERROR=false + shift 1 + ;; + -m|--manifest) + case "$2" in + ''|-*) + printf >&2 "Bad argument: '$2'" + exit 129 + ;; + esac + BOOTSTRAP_MANIFEST_FILE="$2" + shift 2 + ;; + -f|--force) + BOOTSTRAP_LN_ARGS="$BOOTSTRAP_LN_ARGS -f" + shift 1 + ;; + --) + shift 1 + BOOTSTRAP_LN_ARGS="$@" + break + ;; + esac + done + + ## Main loop + while IFS=' ' read -r source destination; do + # Ignore lines beginning with '#' + case "$source" in + '#'*) + if "$BOOTSTRAP_DEBUG"; then + printf >&2 'Skipping comment: %s %s\n' \ + "$source" "$destination" + fi + continue + ;; + esac + + # Ignore empty lines, or lines with only SOURCE or DESTINATION + if [ -z "$source" ] || [ -z "$destination" ]; then + if "$BOOTSTRAP_DEBUG"; then + printf >&2 'Skipping line: %s\t%s\n' \ + "$source" "$destination" + fi + continue + fi + + # Do the thing + if ! dispatch "$source" "$destination"; then + printf >&2 'ERROR: %s -> %s\n' \ + "$source" "$destination" + if "$BOOTSTRAP_QUIT_ON_ERROR"; then + exit "$dispatch_error" + fi + fi + done < "$BOOTSTRAP_MANIFEST_FILE" } - ### Functions dispatch() { # dispatch SOURCE DESTINATION - # Depending on environment variables, do the linking or displaying or - # whatever of a source and a destination. - - ## Variables - - src="$1" - dest="$2" - dispatch_error=0 # success - - ## Sanitize pathnames - - # If the SOURCE starts with ~, /, or $, keep it as-is; otherwise, - # prepend "$PWD/". - case "$src" in - '/'* | '~'* | '$'* ) ;; - *) src="$PWD/$src" ;; - esac - - # Convert ~ to $HOME in SOURCE and DESTINATION, to get around shell - # quoting rules. - src="$(printf '%s\n' "$src" | sed "s#^~#$HOME#")" - dest="$(printf '%s\n' "$dest" | sed "s#^~#$HOME#")" - - ## Do the thing - - # /Always/ tell the user what we're doing. - printf >&2 "ln %s %s %s\n" "$BOOTSTRAP_LN_ARGS" "$src" "$dest" - - case "$BOOTSTRAP_ACTION" in - link) # actually ... do the links - ln $BOOTSTRAP_LN_ARGS "$src" "$dest" || - dispatch_error="$?" - ;; - print) ;; # already printed. - esac - - return "$dispatch_error" + # Depending on environment variables, do the linking or displaying or + # whatever of a source and a destination. + + ## Variables + + src="$1" + dest="$2" + dispatch_error=0 # success + + ## Sanitize pathnames + + # If the SOURCE starts with ~, /, or $, keep it as-is; otherwise, + # prepend "$PWD/". + case "$src" in + '/'* | '~'* | '$'* ) ;; + *) src="$PWD/$src" ;; + esac + + # Convert ~ to $HOME in SOURCE and DESTINATION, to get around shell + # quoting rules. + src="$(printf '%s\n' "$src" | sed "s#^~#$HOME#")" + dest="$(printf '%s\n' "$dest" | sed "s#^~#$HOME#")" + + ## Do the thing + + # /Always/ tell the user what we're doing. + if [ -f "$dest" ]; then + printf >&2 'mv %s %s.old\n' "$dest" "$dest" + fi + printf >&2 "ln %s %s %s\n" "$BOOTSTRAP_LN_ARGS" "$src" "$dest" + + case "$BOOTSTRAP_ACTION" in + link) # actually ... do the links + # if DESTINATION exists, move it to DESTINATION.old + if [ -f "$dest" ]; then + mv "$dest" "$dest.old" + fi + + ln $BOOTSTRAP_LN_ARGS "$src" "$dest" || + dispatch_error="$?" + ;; + print) ;; # already printed. + esac + + return "$dispatch_error" } ### Do the thing -- cgit 1.4.1-21-gabe81 From 8bc9628351fdb752581c421b34b4bfa07b6b4628 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 2 Apr 2022 12:38:24 -0500 Subject: Change printing --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.sh') diff --git a/bootstrap.sh b/bootstrap.sh index 09b8cd6..12d0b9a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -121,7 +121,7 @@ END_HELP case "$source" in '#'*) if "$BOOTSTRAP_DEBUG"; then - printf >&2 'Skipping comment: %s %s\n' \ + printf >&2 '%s %s\n' \ "$source" "$destination" fi continue -- cgit 1.4.1-21-gabe81