From 9450dbb60e1e2886dffb83c2ca897c1acb0d4681 Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Fri, 31 Jan 2020 02:48:20 +0100
Subject: [PATCH] Unify scripts, use readonly and set -e/-u
---
bin/install | 22 ++++++++++++++++++++++
bin/run | 5 +++--
bin/run-sway | 19 ++++++++++---------
install | 18 ------------------
4 files changed, 35 insertions(+), 29 deletions(-)
create mode 100755 bin/install
delete mode 100755 install
diff --git a/bin/install b/bin/install
new file mode 100755
index 0000000..d7e26c2
--- /dev/null
+++ b/bin/install
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+set -u
+
+readonly executable_name=qbar
+
+readonly local_bin=`stack path --local-bin`
+
+readonly executable_path=$local_bin/$executable_name
+
+stack install
+
+echo >&2
+if [ -n "${LOCAL_ZSH_COMPLETION_PATH+set}" -a -d "$LOCAL_ZSH_COMPLETION_PATH" ]
+then
+ ZSH_COMPLETION_SCRIPT_PATH=$LOCAL_ZSH_COMPLETION_PATH/_$executable_name
+ $executable_path --zsh-completion-script $executable_path > $ZSH_COMPLETION_SCRIPT_PATH
+ echo "Installed zsh completions for $executable_name to $ZSH_COMPLETION_SCRIPT_PATH" >&2
+else
+ echo "Not installing completions, set LOCAL_ZSH_COMPLETION_PATH to install them." >&2
+fi
diff --git a/bin/run b/bin/run
index 0863d01..725246f 100755
--- a/bin/run
+++ b/bin/run
@@ -1,7 +1,8 @@
#!/bin/sh
set -e
+set -u
-EXECUTABLE_NAME=qbar
+readonly executable_name=qbar
-stack build && stack exec $EXECUTABLE_NAME -- "$@"
+stack build && stack exec $executable_name -- "$@"
diff --git a/bin/run-sway b/bin/run-sway
index 36edc40..992c0c8 100755
--- a/bin/run-sway
+++ b/bin/run-sway
@@ -1,20 +1,21 @@
#!/bin/sh
set -e
+set -u
-DEFAULT_BAR_COMMAND="qbar server"
-EXECUTABLE_NAME=qbar
-SWAY_BAR_ID=bar-0
+readonly default_bar_command="qbar server"
+readonly executable_name=qbar
+readonly sway_bar_id=bar-0
stack build
-TEMP_DIR=$(mktemp -d)
-STDERR=$TEMP_DIR/stderr
-mkfifo $STDERR
+readonly temp_dir=$(mktemp -d)
+readonly stderr=$temp_dir/stderr
+mkfifo $stderr
-trap "swaymsg bar $SWAY_BAR_ID status_command $DEFAULT_BAR_COMMAND; rm -rf $TEMP_DIR" EXIT INT HUP TERM
+trap "swaymsg bar $sway_bar_id status_command $default_bar_command; rm -rf $temp_dir" EXIT INT HUP TERM
-swaymsg bar $SWAY_BAR_ID status_command "exec $(stack path --local-install-root)/bin/$EXECUTABLE_NAME $@ -- server 2> $STDERR"
+swaymsg bar $sway_bar_id status_command "exec $(stack path --local-install-root)/bin/$executable_name $@ -- server 2> $stderr"
# show output and run forever (use Ctrl-C to stop)
-cat $STDERR
+cat $stderr
diff --git a/install b/install
deleted file mode 100755
index dd3f24c..0000000
--- a/install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-EXECUTABLE_NAME=qbar
-
-LOCAL_BIN=`stack path --local-bin`
-
-EXECUTABLE_PATH=$LOCAL_BIN/$EXECUTABLE_NAME
-
-stack install
-
-if [ -d "$LOCAL_ZSH_COMPLETION_PATH" ]; then
- ZSH_COMPLETION_SCRIPT_PATH=$LOCAL_ZSH_COMPLETION_PATH/_$EXECUTABLE_NAME
- $EXECUTABLE_PATH --zsh-completion-script $EXECUTABLE_PATH > $ZSH_COMPLETION_SCRIPT_PATH
- echo
- echo "Installed zsh completions for $EXECUTABLE_NAME to $ZSH_COMPLETION_SCRIPT_PATH";
-fi
--
GitLab