diff --git a/script/bottle b/script/bottle index f6fe1298..494f0590 100755 --- a/script/bottle +++ b/script/bottle @@ -14,8 +14,8 @@ # Variables # -BUILD_DIR="$PWD/.build" -BOTTLE_DIR="$BUILD_DIR/bottles" +BUILD_DIR="${PWD}/.build" +BOTTLE_DIR="${BUILD_DIR}/bottles" CORE_TAP_PATH="$(brew --repository homebrew/core)" MAS_VERSION=$(script/version) ROOT_URL="https://github.com/mas-cli/mas/releases/download/v${MAS_VERSION}" @@ -37,7 +37,7 @@ OS_NAMES=( el_capitan ) -# Semantic version number split into a list using Ugly, bash 3 compatible syntax +# Semantic version number split into a list using ugly, bash 3 compatible syntax IFS=" " read -r -a CURRENT_OS_VERSION <<<"$(sw_vers -productVersion | sed 's/\./ /g')" CURRENT_OS_VERSION_MAJOR=${CURRENT_OS_VERSION[0]} CURRENT_OS_VERSION_MINOR=${CURRENT_OS_VERSION[1]} diff --git a/script/brew_tap_update b/script/brew_tap_update index 6cce0c25..c6d28488 100755 --- a/script/brew_tap_update +++ b/script/brew_tap_update @@ -79,7 +79,7 @@ $echo git switch "${branch_name}" ################################################################################ # -# Create pr on mas-cli/homebrew-tap +# Create branch on mas-cli/homebrew-tap # # Ensure mas is tapped @@ -101,6 +101,18 @@ $echo git add \ $echo git commit --message="🔖 Version ${MAS_VERSION}" +popd + +# Build in mas project +script/bottle + +################################################################################ +# +# Create PR on mas-cli/homebrew-tap +# + +pushd "${MAS_TAP_PATH}" + $echo gh pr create \ --assignee phatblat \ --base main \