projects
/
webi-installers
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ae2e7d7
)
chore(fish): shellcheck + shfmt
author
AJ ONeal
<aj@therootcompany.com>
Wed, 10 Nov 2021 09:03:14 +0000
(09:03 +0000)
committer
AJ ONeal
<aj@therootcompany.com>
Sun, 14 Nov 2021 08:19:06 +0000
(08:19 +0000)
fish/install.sh
patch
|
blob
|
history
diff --git
a/fish/install.sh
b/fish/install.sh
index 49df30bd5046f463ebf7c016f15872b5f23cc896..cbf28a25c7230b8a21a663d558ca571a0a36e89d 100644
(file)
--- a/
fish/install.sh
+++ b/
fish/install.sh
@@
-1,3
+1,4
@@
+#!/bin/bash
set -e
set -u
set -e
set -u
@@
-12,13
+13,17
@@
fi
################
# Every package should define these 6 variables
################
# Every package should define these 6 variables
+# shellcheck disable=2034
pkg_cmd_name="fish"
pkg_dst_cmd="$HOME/.local/bin/fish"
pkg_cmd_name="fish"
pkg_dst_cmd="$HOME/.local/bin/fish"
+# shellcheck disable=2034
pkg_dst="$pkg_dst_cmd"
pkg_src_cmd="$HOME/.local/opt/fish-v$WEBI_VERSION/bin/fish"
pkg_dst="$pkg_dst_cmd"
pkg_src_cmd="$HOME/.local/opt/fish-v$WEBI_VERSION/bin/fish"
+# shellcheck disable=2034
pkg_src_dir="$HOME/.local/opt/fish-v$WEBI_VERSION"
pkg_src_dir="$HOME/.local/opt/fish-v$WEBI_VERSION"
+# shellcheck disable=2034
pkg_src="$pkg_src_cmd"
# pkg_install must be defined by every package
pkg_src="$pkg_src_cmd"
# pkg_install must be defined by every package
@@
-45,10
+50,10
@@
function _macos_post_install() {
if [ -e "$HOME/Library/Preferences/com.googlecode.iterm2.plist" ]; then
/usr/libexec/PlistBuddy \
-c "SET ':New Bookmarks:0:Custom Command' 'Custom Shell'" \
if [ -e "$HOME/Library/Preferences/com.googlecode.iterm2.plist" ]; then
/usr/libexec/PlistBuddy \
-c "SET ':New Bookmarks:0:Custom Command' 'Custom Shell'" \
- $HOME/Library/Preferences/com.googlecode.iterm2.plist
+ "$HOME/Library/Preferences/com.googlecode.iterm2.plist"
/usr/libexec/PlistBuddy \
-c "SET ':New Bookmarks:0:Command' $HOME/.local/bin/fish" \
/usr/libexec/PlistBuddy \
-c "SET ':New Bookmarks:0:Command' $HOME/.local/bin/fish" \
- $HOME/Library/Preferences/com.googlecode.iterm2.plist
+ "$HOME/Library/Preferences/com.googlecode.iterm2.plist"
echo "To set 'fish' as the default iTerm2 shell:"
echo " iTerm2 > Preferences > Profiles > General > Command >"
echo " Custom Shell: $HOME/.local/bin/fish"
echo "To set 'fish' as the default iTerm2 shell:"
echo " iTerm2 > Preferences > Profiles > General > Command >"
echo " Custom Shell: $HOME/.local/bin/fish"
@@
-80,5
+85,5
@@
function pkg_get_current_version() {
# fish, version 3.1.2
# This trims it down to just the version number:
# 3.1.2
# fish, version 3.1.2
# This trims it down to just the version number:
# 3.1.2
- echo $(fish --version 2> /dev/null | head -n 1 | cut -d ' ' -f 3)
+ fish --version 2> /dev/null | head -n 1 | cut -d ' ' -f 3
}
}