Skip to content

Commit

Permalink
ci: fix github action workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
deild committed Jun 1, 2020
1 parent 21c14e7 commit 93375a5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 23 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ jobs:
build:
runs-on: macos-10.15
steps:
- uses: action/checkout@v2
- name: one line script
run: echo 'Hello, world!'
- uses: actions/checkout@v2
- name: install dependencies
run: brew install shellcheck shfmt
- name: shellcheck
run: shellcheck bootstrap
- name: shfmt
run: shfmt -s -i 2 -bn -ci -sr -kp bootstrap

11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Mac Bootstrap [![Build Status](https://travis-ci.org/deild/mac-bootstrap.svg?branch=master)](https://travis-ci.org/deild/mac-bootstrap) [![MIT](https://img.shields.io/badge/license-MIT-BLUE)](LICENSE)
# Mac Bootstrap ![shellcheck](https://github.com/deild/mac-bootstrap/workflows/shellcheck/badge.svg) [![MIT](https://img.shields.io/badge/license-MIT-BLUE)](LICENSE)

> Your laptop is your sword. Don't go into battle without it.
Expand Down
16 changes: 8 additions & 8 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -79,26 +79,26 @@ printf "Let's get some infos about your setup.\\n"

printf "\\nEnter your desired time zone.
To view available options run 'sudo systemsetup -listtimezones' in other terminal
(Leave blank for default: %s)\\n>_ " "$DEFAULT_TIME_ZONE"
read TIME_ZONE
Leave blank for default: %s)\\n>_ " "$DEFAULT_TIME_ZONE"
read -r TIME_ZONE
export TIME_ZONE=${TIME_ZONE:-$DEFAULT_TIME_ZONE}

printf '\nEnter your desired computer name for your Mac. (Leave blank for default: %s)\n>_ ' "$ACTUAL_COMPUTER_NAME"
read COMPUTER_NAME
read -r COMPUTER_NAME
export COMPUTER_NAME="${COMPUTER_NAME:-$ACTUAL_COMPUTER_NAME}"

printf '\nEnter url for masOS defaults file. (Leave blank for default: %s)\n>_ ' "$MACOS_DEFAULT_URL"
read MACOS_URL
read -r MACOS_URL
export MACOS_URL="${MACOS_URL:-$MACOS_DEFAULT_URL}"

printf 'Do you want disable Gatekeeper? (Y/n) \n>_ '
read REPLY
read -r REPLY
if [[ $REPLY =~ ^[Nn]$ ]]; then
GATEKEEPER_DISABLE="No"
fi

printf '\nEnter a passphrase for generete ssh key. (Leave blank for default: %s)\n>_ ' "$DEFAULT_PASSPHRASE"
read PASSPHRASE
read -r PASSPHRASE
export PASSPHRASE="${PASSPHRASE:-$DEFAULT_PASSPHRASE}"

printf "\\nLooks good. Here's what we've got so far.\\n"
Expand All @@ -109,7 +109,7 @@ bootstrap_echo "macos defaults file: [%s]" "$MACOS_URL"
bootstrap_echo "Passphrase [%s]" "$PASSPHRASE"
printf '\n'
printf "Continue? (y/N) \\n>_ "
read REPLY
read -r REPLY
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
bootstrap_echo "Exit on demand"
exit 0
Expand Down Expand Up @@ -314,7 +314,7 @@ brew cleanup -s --prune 1
if ! command -v virtualbox; then
if ! brew cask install virtualbox; then
printf "Continue? (y/N) \\n>_ "
read REPLY
read -r REPLY
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
bootstrap_echo "Exit on demand"
exit 0
Expand Down

0 comments on commit 93375a5

Please sign in to comment.