Skip to content

Commit 495dcaf

Browse files
authored
Apply suggestions from code review
Co-authored-by: Benjamin Bartels <[email protected]>
1 parent 8b527a7 commit 495dcaf

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/kubectl-helm-minikube/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ KUBECTL_MIRROR="${KUBECTL_MIRROR:-https://dl.k8s.io}"
2222
HELM_MIRROR="${HELM_MIRROR:-https://get.helm.sh}"
2323
MINIKUBE_MIRROR="${MINIKUBE_MIRROR:-https://storage.googleapis.com/minikube}"
2424
GITHUB_RELEASE_URL="${GITHUB_RELEASE_MIRROR:-https://github.com}"
25+
GITHUB_USERCONTENT_URL="${GITHUB_USERCONTENT_MIRROR:-https://raw.githubusercontent.com}"
2526
KUBECTL_GCS_MIRROR="${KUBECTL_GCS_MIRROR:-https://storage.googleapis.com/kubernetes-release}"
2627

2728
KUBECTL_SHA256="${KUBECTL_SHA256:-"automatic"}"
2829
HELM_SHA256="${HELM_SHA256:-"automatic"}"
2930
MINIKUBE_SHA256="${MINIKUBE_SHA256:-"automatic"}"
3031
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
3132

32-
HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
33+
HELM_GPG_KEYS_URI="${GITHUB_USERCONTENT_URL}/helm/helm/main/KEYS"
3334

3435
if [ "$(id -u)" -ne 0 ]; then
3536
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'

src/php/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ find_prev_version_from_git_tags() {
167167
# Install PHP Composer
168168
addcomposer() {
169169
"${PHP_SRC}" -r "copy('${COMPOSER_MIRROR}/installer', 'composer-setup.php');"
170-
HASH="$(wget -q -O - ${COMPOSER_SIG_MIRROR}/installer.sig)"
170+
HASH="$(wget -q -O - "${COMPOSER_SIG_MIRROR}/installer.sig")"
171171
"${PHP_SRC}" -r "if (hash_file('sha384', 'composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
172172
"${PHP_SRC}" composer-setup.php --install-dir="/usr/local/bin" --filename=composer
173173
"${PHP_SRC}" -r "unlink('composer-setup.php');"

0 commit comments

Comments
 (0)