diff --git a/distributions/build-debian-package-auto.sh b/distributions/build-debian-package-auto.sh index 16e6a6b3c3..8b6241a15c 100755 --- a/distributions/build-debian-package-auto.sh +++ b/distributions/build-debian-package-auto.sh @@ -6,7 +6,7 @@ cp -r debian .. cd .. # get the jamulus version from pro file -VERSION=$(cat Jamulus.pro | grep -oP 'VERSION = \K\w[^\s\\]*') +VERSION=$(grep -oP 'VERSION = \K\w[^\s\\]*' Jamulus.pro) export DEBFULLNAME=GitHubActions DEBEMAIL=noemail@example.com diff --git a/mac/deploy_mac.sh b/mac/deploy_mac.sh index 438fc38a7b..b40e0855f8 100755 --- a/mac/deploy_mac.sh +++ b/mac/deploy_mac.sh @@ -12,21 +12,21 @@ cert_name="" while getopts 'hs:' flag; do case "${flag}" in - s) - cert_name=$OPTARG + s) + cert_name=$OPTARG if [[ -z "$cert_name" ]]; then echo "Please add the name of the certificate to use: -s \"\"" fi # shift 2 ;; - h) - echo "Usage: -s for signing mac build" - exit 0 + h) + echo "Usage: -s for signing mac build" + exit 0 ;; *) exit 1 ;; - + esac done @@ -44,7 +44,7 @@ build_app() { # Build Jamulus qmake "${project_path}" -o "${build_path}/Makefile" "CONFIG+=release" ${@:2} - local target_name="$(cat "${build_path}/Makefile" | sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p')" + local target_name=$(sed -nE 's/^QMAKE_TARGET *= *(.*)$/\1/p' "${build_path}/Makefile") local job_count="$(sysctl -n hw.ncpu)" make -f "${build_path}/Makefile" -C "${build_path}" -j "${job_count}" @@ -73,7 +73,7 @@ build_installer_image() local dmgbuild_bin="$(python -c 'import site; print(site.USER_BASE)')/bin/dmgbuild" # Get Jamulus version - local app_version="$(cat "${project_path}" | sed -nE 's/^VERSION *= *(.*)$/\1/p')" + local app_version="$(grep -oP 'VERSION = \K\w[^\s\\]*' Jamulus.pro)" # Build installer image "${dmgbuild_bin}" -s "${macdeploy_path}/deployment_settings.py" -D background="${resources_path}/installerbackground.png" \