diff options
| -rwxr-xr-x | coin/provisioning/common/linux/disable-ntp_linux.sh | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index c509d36b..dc592553 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -44,5 +44,5 @@ elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then sudo timedatectl set-ntp false else - (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off + sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b40c1922..f1b5e6b5 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -122,7 +122,7 @@ function MountAndInstall { sudo cp $targetFileMount /tmp UnMount sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null mountFolder="/Volumes/froglogic Squish" UnMount elif [[ $targetFile == *.run ]]; then @@ -130,7 +130,7 @@ function MountAndInstall { sudo cp $targetFileMount $targetDirectory UnMount sudo chmod +x $targetDirectory/$targetFile - sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null sudo rm -fr "$targetDirectory/$targetFile" if uname -a |grep -q "Ubuntu"; then sudo mkdir /usr/lib/tcl8.6 |