Skip to content

Commit 11c7aac

Browse files
committed
Fix shellcheck
1 parent b376c54 commit 11c7aac

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: ./install.sh
2828

2929
- name: Shellcheck
30-
run: shellcheck -x *.sh
30+
run: shellcheck *.sh
3131

3232
- name: Upgrade packages
3333
run: ./install.sh

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ cd ~/Downloads
66
curl -sL https://raw.githubusercontent.com/pathikrit/mac-setup-script/master/defaults.sh | bash
77
curl -O https://raw.githubusercontent.com/pathikrit/mac-setup-script/master/install.sh
88
chmod +x install.sh
9-
./install.sh >> install_log.txt
9+
./install.sh
1010
```

install.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ brews=(
6767
bat
6868
coreutils
6969
colima
70-
docker
70+
docker
7171
docker-compose
7272
dfc # https://github.com/rolinh/dfc
7373
exa # https://the.exa.website/
@@ -95,7 +95,7 @@ brews=(
9595
postgresql
9696
pgcli
9797
pv # https://www.ivarch.com/programs/pv.shtml
98-
python
98+
python
9999
osquery
100100
ruby
101101
shellcheck # https://www.shellcheck.net/
@@ -187,10 +187,10 @@ function install {
187187

188188
function brew_install_or_upgrade {
189189
if brew ls --versions "$1" >/dev/null; then
190-
if (brew outdated | grep "$1" > /dev/null); then
190+
if (brew outdated | grep "$1" > /dev/null); then
191191
echo "Upgrading already installed package $1 ..."
192192
brew upgrade "$1"
193-
else
193+
else
194194
echo "Latest $1 is already installed"
195195
fi
196196
else
@@ -219,6 +219,7 @@ export HOMEBREW_NO_AUTO_UPDATE=1
219219

220220
echo "Installing SDKs ..."
221221
curl -s "https://get.sdkman.io" | bash
222+
# shellcheck source=/dev/null
222223
source "$HOME/.sdkman/bin/sdkman-init.sh"
223224
for sdk in "${sdks[@]}"
224225
do
@@ -250,7 +251,7 @@ if [[ -z "${CI}" ]]; then
250251
ssh-keygen -t rsa -b 4096 -C ${git_email}
251252
pbcopy < ~/.ssh/id_rsa.pub
252253
open https://github.com/settings/ssh/new
253-
fi
254+
fi
254255

255256
echo "Setting up bash aliases ..."
256257
echo "
@@ -260,6 +261,7 @@ alias cat=bat
260261
" >> ~/.bash_profile
261262
# https://github.com/twolfson/sexy-bash-prompt
262263
echo "Setting up bash prompt ..."
264+
# shellcheck source=/dev/null
263265
(cd /tmp && ([[ -d sexy-bash-prompt ]] || git clone --depth 1 --config core.autocrlf=false https://github.com/twolfson/sexy-bash-prompt) && cd sexy-bash-prompt && make install) && source ~/.bashrc
264266

265267

0 commit comments

Comments
 (0)