From 304bb22ee3ce27bf0f9d313ba2e004aa439849b8 Mon Sep 17 00:00:00 2001 From: Jameson Miller Date: Thu, 29 Aug 2019 16:46:30 -0400 Subject: [PATCH] ScalarInstall: use fully qualified paths to binaries --- Scripts/Mac/CreateScalarDistribution.sh | 2 +- Scripts/Mac/InstallScalarTemplate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/Mac/CreateScalarDistribution.sh b/Scripts/Mac/CreateScalarDistribution.sh index 3bccfa585b..1add25ca31 100755 --- a/Scripts/Mac/CreateScalarDistribution.sh +++ b/Scripts/Mac/CreateScalarDistribution.sh @@ -80,4 +80,4 @@ cp -Rf "$SCALAR_INSTALLER_PKG_SRC_PATH" "$DISTRIBUTION_DIR/Scalar/$SCALAR_INSTAL /usr/bin/sed -e "s|##GIT_INSTALLER_PKG_PLACEHOLDER##|$GIT_INSTALLER_PKG|g" "$SCALAR_SCRIPT_DIR/InstallScalarTemplate.sh" > "$DISTRIBUTION_DIR/InstallScalar.sh" /usr/bin/sed -i.bak "s|##GCM_CORE_INSTALLER_PKG_PLACEHOLDER##|$GCM_INSTALLER_PKG|g" "$DISTRIBUTION_DIR/InstallScalar.sh" /usr/bin/sed -i.bak "s|##SCALAR_INSTALLER_PKG_PLACEHOLDER##|$SCALAR_INSTALLER_PKG|g" "$DISTRIBUTION_DIR/InstallScalar.sh" -chmod +x "$DISTRIBUTION_DIR/InstallScalar.sh" +/bin/chmod +x "$DISTRIBUTION_DIR/InstallScalar.sh" diff --git a/Scripts/Mac/InstallScalarTemplate.sh b/Scripts/Mac/InstallScalarTemplate.sh index 3cb92e3ab3..3023110689 100644 --- a/Scripts/Mac/InstallScalarTemplate.sh +++ b/Scripts/Mac/InstallScalarTemplate.sh @@ -115,7 +115,7 @@ if [ -f "$SCALAR_DISTRIBUTION_ROOT/Scripts/PostInstall.sh" ]; then echo "" echo "==============================" echo "Running post install script" - sudo bin/bash "$SCALAR_DISTRIBUTION_ROOT/Scripts/PostInstall.sh" + sudo /bin/bash "$SCALAR_DISTRIBUTION_ROOT/Scripts/PostInstall.sh" fi # Installation Complete!