Skip to content

Commit

Permalink
[fix] fix shfmt error
Browse files Browse the repository at this point in the history
  • Loading branch information
nomutin committed Jul 16, 2023
1 parent 9940427 commit e25062a
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 38 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ init:

.PHONY: shellcheck
shellcheck:
zsh scripts/shellcheck.sh
bash scripts/shellcheck.sh

.PHONY: actionlint
actionlint:
zsh scripts/actionlint.sh
bash scripts/actionlint.sh

.PHONY: shfmt
shfmt:
zsh scripts/shfmt.sh
bash scripts/shfmt.sh
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
## Installation

```shell
bash -c "$(curl https://raw.githubusercontent.com/nomutin/dotfiles/main/etc/scripts/install.sh)"
bash -c "$(curl https://raw.githubusercontent.com/nomutin/dotfiles/main/scripts/install.sh)"
```
14 changes: 7 additions & 7 deletions scripts/actionlint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
set -u

files=(
scripts/deploy.sh
scripts/init.sh
scripts/install.sh
scripts/shellcheck.sh
scripts/actionlint.sh
scripts/shfmt.sh
scripts/deploy.sh
scripts/init.sh
scripts/install.sh
scripts/shellcheck.sh
scripts/actionlint.sh
)

for file in "${files[@]}"; do
actionlint "${file}"
actionlint "${file}"
done
2 changes: 1 addition & 1 deletion scripts/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DOT_FILES=(.gitconfig .zshrc .gitignore .vimrc .vim .latexmkrc)
for file in ${DOT_FILES[@]}; do
ln -sf $HOME/dotfiles/$file $HOME/$file
ln -sf $HOME/dotfiles/$file $HOME/$file
done
8 changes: 4 additions & 4 deletions scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ set -eu
cd "${HOME}"

if !(type 'brew' > /dev/null 2>&1); then
xcode-select --install
/bin/zsh -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
export PATH=$PATH:/opt/homebrew/bin
xcode-select --install
/bin/zsh -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
export PATH=$PATH:/opt/homebrew/bin
fi

if [ ! -d dotfiles ]; then
git clone https://github.com/nomutin/dotfiles.git
git clone https://github.com/nomutin/dotfiles.git
fi

cd dotfiles
Expand Down
14 changes: 7 additions & 7 deletions scripts/shellcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
set -u

files=(
scripts/deploy.sh
scripts/init.sh
scripts/install.sh
scripts/shellcheck.sh
scripts/actionlint.sh
scripts/shfmt.sh
scripts/deploy.sh
scripts/init.sh
scripts/install.sh
scripts/shellcheck.sh
scripts/actionlint.sh
)

for file in "${files[@]}"; do
shellcheck "${file}"
shellcheck "${file}"
done
15 changes: 0 additions & 15 deletions scripts/shfmt.sh

This file was deleted.

0 comments on commit e25062a

Please sign in to comment.