Various bug fixes in build scripts

CozmoNate · Sep 27, 2013 · ed4532c · ed4532c
1 parent 4b016e5
commit ed4532c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Scripts/BuildInstaller.sh b/Scripts/BuildInstaller.sh
@@ -7,6 +7,7 @@
 #
 
 find ./Package/ -maxdepth 1 -type f -name "*.pkg" -delete
+find ./Binaries/ -maxdepth 1 -type f -name "*.pkg" -delete
 find ./Package/ -maxdepth 1 -type f -name "Distribution.xml" -delete
 
 if [ "$1" == "clean" ]
@@ -84,4 +85,4 @@ sed -i '' 's/DISTRIBUTION_TITLE/'${project_name}' 'v${full_version}'/g' ./Packag
 productbuild --distribution "./Package/Distribution.xml"  \
 --package-path "./Package/" \
 --resources "./Package/Resources" \
-"./Binaries/HWMonitor.unsigned.pkg"
+"./Binaries/${project_name}.${full_version}.unsigned.pkg"
diff --git a/Scripts/GenerateAppcast.sh b/Scripts/GenerateAppcast.sh
@@ -7,7 +7,6 @@
 #
 
 find ./Binaries/ -maxdepth 1 -type f -name "*.tar.gz" -delete
-find ./Binaries/ -maxdepth 1 -type f -name "*.zip" -delete
 find ./Binaries/ -maxdepth 1 -type f -name "*.tar.gz.dsa" -delete
 
 if [ "$1" == "clean" ]
@@ -21,7 +20,7 @@ last_revision=$(<"./revision.txt")
 full_version=${project_version}'.'${last_revision}
 zip_filename=${project_name}.${full_version}.tar.gz
 
-cp ./Binaries/HWSensors.${full_version}.pkg ./Binaries/HWMonitor.pkg
+cp ./Binaries/${project_name}.${full_version}.pkg ./Binaries/HWMonitor.pkg
 tar -zcvf ./Binaries/${zip_filename} ./Binaries/HWMonitor.pkg
 rm ./Binaries/HWMonitor.pkg
 

diff --git a/Scripts/SignInstaller.sh b/Scripts/SignInstaller.sh
@@ -16,13 +16,14 @@ project_name=$(/usr/libexec/PlistBuddy -c "Print 'Project Name'" "./version.plis
 project_version=$(/usr/libexec/PlistBuddy -c "Print 'Project Version'" "./version.plist")
 last_revision=$(<"./revision.txt")
 full_version=${project_version}'.'${last_revision}
-pkg_filename=${project_name}.${full_version}.pkg
+unsigned_pkg=${project_name}.${full_version}.unsigned.pkg
+signed_pkg=${project_name}.${full_version}.pkg
 
-productsign --sign "Developer ID Installer" ./Binaries/HWMonitor.unsigned.pkg ./Binaries/HWMonitor.pkg
-spctl -a -v --type install ./Binaries/HWMonitor.pkg
+productsign --sign "Developer ID Installer" ./Binaries/${unsigned_pkg} ./Binaries/${signed_pkg}
+spctl -a -v --type install ./Binaries/${signed_pkg}
 
 if [ $? -eq 0 ]; then
-    rm ./Binaries/HWMonitor.unsigned.pkg
+    rm ./Binaries/${unsigned_pkg}
 else
     exit 1
 fi