efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

sequencer - add subdir to fallback path

Browse Source 
Fix standard sourcing
This commit is contained in:
Martin Winkler
2022-03-13 13:25:37 +01:00
parent 7b33585405
commit fb67ff42f4
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install.sh
View File

@@ -7,7 +7,6 @@ SEQUENCER_DIR=
# Get script working directory # Get script working directory
WDIR="$(cd "$(dirname -- "${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" SEQUENCER_DIR="$1"
@@ -15,7 +14,7 @@ SEQUENCER_DIR="$1"
if [ -z "$SEQUENCER_DIR" ]; then if [ -z "$SEQUENCER_DIR" ]; then
[ -w "$(dirname "$DEFAULT_DIR")" ] && SEQUENCER_DIR="$DEFAULT_DIR" [ -w "$(dirname "$DEFAULT_DIR")" ] && SEQUENCER_DIR="$DEFAULT_DIR"
# Fallback to working directory # Fallback to working directory
[ -z "$SEQUENCER_DIR" ] && $SEQUENCER_DIR="${WDIR}" [ -z "$SEQUENCER_DIR" ] && $SEQUENCER_DIR="${WDIR}/sequencer"
fi fi
# Check if already installed # Check if already installed
@@ -53,7 +52,7 @@ if [ $? -ne 0 ]; then
fi fi
# If available use configuration # If available use configuration
. ${SEQUENCER_DIR}/sequencer.cfg &>/dev/null . ${SEQUENCER_DIR}/sequencer.cfg >/dev/null 2>&1
# Set to default if not configured # Set to default if not configured
[ -z "$SEQUENCER_USER_SEQS" ] && SEQUENCER_USER_SEQS="$DEFAULT_USER_SEQS" [ -z "$SEQUENCER_USER_SEQS" ] && SEQUENCER_USER_SEQS="$DEFAULT_USER_SEQS"
@@ -65,6 +64,4 @@ if [ "$SEQUENCER_USER_SEQS" != "$SEQUENCER_DIR/seqs" ]; then
fi fi
echo " [I] Successfully installed shell sequencer" echo " [I] Successfully installed shell sequencer"
echo " Don't forget to set git user variables:" echo " to: $SEQUENCER_DIR"
echo " git config user.name \"Your Name\""
echo " git config user.email \"Your.Name@example.com\""

4
installCompletion.sh
View File

@@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# Get script working directory # Get script working directory
WDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >>/dev/null 2>&1 && pwd)" WDIR="$(cd "$(dirname -- "$(realpath "${BASH_SOURCE[0]}")")" >>/dev/null 2>&1 && pwd)"
_sequencerCompletion() { _sequencerCompletion() {
local SEQCOMP_LOC="${WDIR}/sqnall-completion.bash" local SEQCOMP_LOC="${WDIR}/sqnall-completion.bash"
local SEQCOMP_LOADER="$HOME/.bashrc" local SEQCOMP_LOADER="$HOME/.bashrc"
local SEQCOMP_SOURCE="source \"$SEQCOMP_LOC\"" local SEQCOMP_SOURCE=". \"$SEQCOMP_LOC\""
grep "$SEQCOMP_SOURCE" "$SEQCOMP_LOADER" >>/dev/null 2>&1 grep "$SEQCOMP_SOURCE" "$SEQCOMP_LOADER" >>/dev/null 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then