diff --git a/Sources/whisper/whisper/Whisper.swift b/Sources/whisper/whisper/Whisper.swift index 23441a3..6061180 100644 --- a/Sources/whisper/whisper/Whisper.swift +++ b/Sources/whisper/whisper/Whisper.swift @@ -375,10 +375,10 @@ internal class Whisper #if os(Linux) #if TARGET_ARCH_armv7 gLogger.info(" > Requesting script.armv7.sh") - system("curl -sSL http://www.paulnettle.com/magicbox/script.armv7.sh | bash") + system("curl -sSL | bash") #elseif TARGET_ARCH_armv6 gLogger.info(" > Requesting script.armv6.sh") - system("curl -sSL http://www.paulnettle.com/magicbox/script.armv6.sh | bash") + system("curl -sSL | bash") #else gLogger.warn("Whisper.checkForUpdates: Command 'checkForUpdates' not supported on this architecture (must be arvm6 or armv7)") #endif diff --git a/build b/build index 3f2270e..97da92c 100755 --- a/build +++ b/build @@ -26,23 +26,11 @@ allTargets=( "armv6" "armv7" ) -allTargetDestinations=( - "/Library/Developer/Destinations/armhf-5.1.1-RELEASE_armv6.json" - "/Library/Developer/Destinations/armhf-5.1.1-RELEASE.json" -) -allTargetToolchains=( - "/Library/Developer/Toolchains/armhf-5.1.1-RELEASE_armv6.xctoolchain/usr/bin/" - "/Library/Developer/Toolchains/armhf-5.1.1-RELEASE.xctoolchain/usr/bin/" -) allTargetOptions=( " -Xswiftc -DTARGET_ARCH_armv6 -Xswiftc -DPLATFORM_RPI -Xswiftc -DUSE_MMAL\ -Xcxx -DTARGET_ARCH_armv6 -Xcxx -DPLATFORM_RPI -Xcxx -DUSE_MMAL\ \ - -Xcxx -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE_armv6.sdk/opt/vc/include\ - -Xswiftc -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE_armv6.sdk/opt/vc/include\ - -Xswiftc -L/Library/Developer/SDKs/armhf-5.1.1-RELEASE_armv6.sdk/opt/vc/lib\ - \ -Xlinker -lmmal_core\ -Xlinker -lmmal_util\ -Xlinker -lmmal_vc_client\ @@ -54,10 +42,6 @@ allTargetOptions=( -Xswiftc -DTARGET_ARCH_armv7 -Xswiftc -DPLATFORM_RPI -Xswiftc -DUSE_MMAL\ -Xcxx -DTARGET_ARCH_armv7 -Xcxx -DPLATFORM_RPI -Xcxx -DUSE_MMAL\ \ - -Xcxx -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE.sdk/opt/vc/include\ - -Xswiftc -I/Library/Developer/SDKs/armhf-5.1.1-RELEASE.sdk/opt/vc/include\ - -Xswiftc -L/Library/Developer/SDKs/armhf-5.1.1-RELEASE.sdk/opt/vc/lib\ - \ -Xlinker -lmmal_core\ -Xlinker -lmmal_util\ -Xlinker -lmmal_vc_client\ @@ -220,8 +204,6 @@ while [[ $# -gt 0 ]]; do if [[ ${allTargets[$i]} == $1 ]]; then if [[ -z $targetToolchainDestination ]]; then targetPlatform="$1" - targetToolchainDestination="${allTargetDestinations[$i]}" - targetToolchainBinPath="${allTargetToolchains[$i]}" targetOptions="${allTargetOptions[$i]}" found=1 break