Skip to content

Commit 65cca2f

Browse files
committed
use double-quotes to make output more readable
commit 766b70c quoted these values to prevent globbing, but used single quotes. However, these commands are executed with `sh -c` using single quotes, which makes the output hard to read because of the embedded quotes being escaped. This patch changes to use double-quotes, which should still prevent globbing to happen, but make the output more readable. Before: CHANNEL=test ./install.sh ... Adding repo from: https://download.docker.com/linux/centos/docker-ce.repo + '[' test '!=' stable ']' + sh -c 'dnf config-manager --set-disabled '\''docker-ce-*'\''' + sh -c 'dnf config-manager --set-enabled '\''docker-ce-test'\''' + sh -c 'dnf makecache' After: CHANNEL=test ./install.sh ... Adding repo from: https://download.docker.com/linux/centos/docker-ce.repo + '[' test '!=' stable ']' + sh -c 'dnf config-manager --set-disabled "docker-ce-*"' + sh -c 'dnf config-manager --set-enabled "docker-ce-test"' + sh -c 'dnf makecache' Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 992da63 commit 65cca2f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

install.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,26 +569,26 @@ do_install() {
569569
$sh_c "rm -f '${TMP_REPO_FILE}'"
570570

571571
if [ "$CHANNEL" != "stable" ]; then
572-
$sh_c "dnf5 config-manager setopt 'docker-ce-*.enabled=0'"
573-
$sh_c "dnf5 config-manager setopt 'docker-ce-$CHANNEL.enabled=1'"
572+
$sh_c "dnf5 config-manager setopt \"docker-ce-*.enabled=0\""
573+
$sh_c "dnf5 config-manager setopt \"docker-ce-$CHANNEL.enabled=1\""
574574
fi
575575
$sh_c "dnf makecache"
576576
elif command_exists dnf; then
577577
$sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
578578
$sh_c "dnf config-manager --add-repo $repo_file_url"
579579

580580
if [ "$CHANNEL" != "stable" ]; then
581-
$sh_c "dnf config-manager --set-disabled 'docker-ce-*'"
582-
$sh_c "dnf config-manager --set-enabled 'docker-ce-$CHANNEL'"
581+
$sh_c "dnf config-manager --set-disabled \"docker-ce-*\""
582+
$sh_c "dnf config-manager --set-enabled \"docker-ce-$CHANNEL\""
583583
fi
584584
$sh_c "dnf makecache"
585585
else
586586
$sh_c "yum -y -q install yum-utils"
587587
$sh_c "yum config-manager --add-repo $repo_file_url"
588588

589589
if [ "$CHANNEL" != "stable" ]; then
590-
$sh_c "yum config-manager --disable 'docker-ce-*'"
591-
$sh_c "yum config-manager --enable 'docker-ce-$CHANNEL'"
590+
$sh_c "yum config-manager --disable \"docker-ce-*\""
591+
$sh_c "yum config-manager --enable \"docker-ce-$CHANNEL\""
592592
fi
593593
$sh_c "yum makecache"
594594
fi

0 commit comments

Comments
 (0)