sface-0.9-7 is broken for macos packaging, fix attempt

[sface.git] / macos / build-dmg.sh

diff --git a/macos/build-dmg.sh b/macos/build-dmg.sh
index 9069dcb..323ab8f 100755 (executable)
--- a/macos/build-dmg.sh
+++ b/macos/build-dmg.sh
@@ -12,7 +12,7 @@
 # the script expects the taglevels for both sfa and sface, 
 #   in order to retrieve the corresponding code and to label the resulting package properly
 #   alternatively, a build-dir and tags file can be used instead
-# Should have the folowing tools installed
+# Should have the following tools installed
 #   git: to retrieve code
 #   rpm: to retrieve the version numbers in specfiles
 
@@ -168,15 +168,11 @@ Also make sure to trash the current one before retrying"
     sface_version=$(rpm -q --specfile $sface_spec --qf '%{version}\n' | head -1)
     sface_release=$(rpm -q --specfile $sface_spec --qf '%{release}\n' | head -1 | cut -d. -f1)
     sface_tag=${sface_version}-${sface_release}
-    echo Before running make -C $temp/sface VERSIONTAG="${sface_tag}" SCMURL="${sface_GITPATH}" version
-    head -100 $temp/sface/sface/version.py{,.in}
     make -C $temp/sface VERSIONTAG="${sface_tag}" SCMURL="${sface_GITPATH}" version
-    echo AFTER
-    head -100 $temp/sface/sface/version.py{,.in}
 
     # copy sfa/ and sface/ subdirs in image
-    rm -rf "$img_mnt"/$resource_path/{sfa,sface}
-    tar -C $temp/sfa -cf - sfa | tar -C "$img_mnt"/$resource_path/ -xf -
+    rm -rf "$img_mnt"/$resource_path/{sfa,clientbin,sface}
+    tar -C $temp/sfa -cf - sfa clientbin | tar -C "$img_mnt"/$resource_path/ -xf -
     tar -C $temp/sface -cf - sface | tar -C "$img_mnt"/$resource_path/ -xf -
 
     # copy binaries from sface to the bin dir
@@ -187,9 +183,11 @@ Also make sure to trash the current one before retrying"
     ### install background and app icons
     # clean up any 'background' dir if exists
     rm -rf "$img_mnt"/{,.}background 
-    mkdir -p "$img_mnt"/.background "$img_mnt"/$resource_path
+    mkdir -p "$img_mnt"/.background "$img_mnt"/$resource_path/sface/images
     cp $temp/sface/macos/graphic-install-background.png "$img_mnt"/.background/background.png
     cp $temp/sface/macos/graphic-sfa.icns "$img_mnt"/$resource_path/appIcon.icns
+    cp $temp/sface/macos/graphic-sfa.png "$img_mnt"/$resource_path/sface/images
+    cp $temp/sface/macos/graphic-sfa64.png "$img_mnt"/$resource_path/sface/images
     # the volume icons won't work - who cares
 #    cp $temp/sface/macos/graphic-vol-sface.icns "$img_mnt"/.background/volumeIcon.icns
 #    cp $temp/sface/macos/graphic-vol-sface.png "$img_mnt"/.background/volumeIcon.png