From eed4089f9ec6be7eaa00b1ccac0fb0c300f46566 Mon Sep 17 00:00:00 2001 From: Martin Winkler Date: Sun, 13 Mar 2022 07:28:44 +0100 Subject: [PATCH] Fix normal install without arguments (test BASH_SOURCE[0] --- install.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/install.sh b/install.sh index be59d68..55c8cda 100755 --- a/install.sh +++ b/install.sh @@ -1,28 +1,23 @@ #!/bin/bash SEQGITURL="https://winklerfamilie.eu/git/efelon/shell_sequencer.git" +DEFAULT_DIR="/opt/sequencer" +DEFAULT_USER_SEQS="/opt/seqs" SEQUENCER_DIR= # Get script working directory -WDIR="$(cd "$(dirname -- "$(realpath ${BASH_SOURCE[0]})")" >>/dev/null 2>&1 && pwd)" - +WDIR="$(cd "$(dirname -- "${BASH_SOURCE[0]}")" >>/dev/null 2>&1 && pwd)" +echo "WDIR:$WDIR" + SEQUENCER_DIR="$1" # Installation directory was not set by argument -d if [ -z "$SEQUENCER_DIR" ]; then + [ -w "$(dirname "$DEFAULT_DIR")" ] && SEQUENCER_DIR="$DEFAULT_DIR" # Fallback to working directory - SEQUENCER_DIR="${WDIR}" + [ -z "$SEQUENCER_DIR" ] && $SEQUENCER_DIR="${WDIR}" fi -echo $SEQUENCER_DIR -exit 0 - -# If available use configuration -. ${WDIR}/sequencer.cfg &>/dev/null - -# Set to default if not configured -[ -z "$SEQUENCER_USER_SEQS" ] && SEQUENCER_USER_SEQS="/opt/seqs" - # Check if already installed if [ -d "$SEQUENCER_DIR" ]; then echo " [E] Sequencer seems to be already installed at:" @@ -57,6 +52,12 @@ if [ $? -ne 0 ]; then exit 4 fi +# If available use configuration +. ${SEQUENCER_DIR}/sequencer.cfg &>/dev/null + +# Set to default if not configured +[ -z "$SEQUENCER_USER_SEQS" ] && SEQUENCER_USER_SEQS="$DEFAULT_USER_SEQS" + # Install sequncer script ln -s "${SEQUENCER_DIR}/sequencer/sequencer.sh" "/usr/local/bin" if [ "$SEQUENCER_USER_SEQS" != "$SEQUENCER_DIR/seqs" ]; then