Skip to content

Commit 46a31d0

Browse files
committed
fix(installer): sync promoted script with dev installer
1 parent 85a0faf commit 46a31d0

1 file changed

Lines changed: 5 additions & 17 deletions

File tree

install.sh

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ download_release_asset() {
114114
return 0
115115
fi
116116

117-
# GitHub normalizes `~` to `.` in release asset names, while the checksum file
118-
# still records the Debian package filename with `~dev` for correct version
119-
# ordering. Download the normalized asset but verify it against the checksum
120-
# entry for the original package filename.
117+
# GitHub normalizes `~` to `.` in release asset names, while checksum files
118+
# can still record package filenames with `~dev` for correct version ordering.
119+
# Download the normalized asset but verify it against the checksum entry for
120+
# the original package filename.
121121
_normalized="$(printf '%s' "$_filename" | tr '~' '.')"
122122
if [ "$_normalized" != "$_filename" ]; then
123123
if download "${GITHUB_URL}/releases/download/${_tag}/${_normalized}" "$_output"; then
@@ -429,18 +429,6 @@ patch_homebrew_formula() {
429429
mv "$_patched_file" "$_formula_file"
430430
fi
431431

432-
if ! grep -q 'OPENSHELL_DRIVERS:' "$_formula_file"; then
433-
info "patching Homebrew formula to use VM driver..."
434-
awk '
435-
{
436-
print
437-
if ($0 ~ /^[[:space:]]*environment_variables\(/) {
438-
print " OPENSHELL_DRIVERS: \"vm\","
439-
}
440-
}
441-
' "$_formula_file" >"$_patched_file"
442-
mv "$_patched_file" "$_formula_file"
443-
fi
444432
}
445433

446434
start_user_gateway() {
@@ -514,7 +502,7 @@ remove_local_gateway_registration() {
514502
[ -n "$TARGET_HOME" ] || error "cannot resolve home directory for ${TARGET_USER}"
515503
_config_dir="${TARGET_HOME}/.config/openshell"
516504

517-
# The package-installed gateway is a user service. Replace the CLI registration
505+
# The install-dev gateway is a user service. Replace the CLI registration
518506
# directly instead of asking `gateway destroy` to tear down Docker resources.
519507
# shellcheck disable=SC2016
520508
as_target_user sh -c '

0 commit comments

Comments
 (0)