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

diff --git a/macos/build-dmg.sh b/macos/build-dmg.sh
index 9f893ba..323ab8f 100755 (executable)
--- a/macos/build-dmg.sh
+++ b/macos/build-dmg.sh
@@ -171,8 +171,8 @@ Also make sure to trash the current one before retrying"
     make -C $temp/sface VERSIONTAG="${sface_tag}" SCMURL="${sface_GITPATH}" version
 
     # copy sfa/ and sface/ subdirs in image
     make -C $temp/sface VERSIONTAG="${sface_tag}" SCMURL="${sface_GITPATH}" version
 
     # 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
     tar -C $temp/sface -cf - sface | tar -C "$img_mnt"/$resource_path/ -xf -
 
     # copy binaries from sface to the bin dir

diff --git a/sface.bin b/sface.bin
index c7b8119..0de4852 100755 (executable)
--- a/sface.bin
+++ b/sface.bin
@@ -8,7 +8,7 @@ FRAMEWORKS=$CONTENTS/Frameworks
 DYLD_FRAMEWORK_PATH=$FRAMEWORKS
 DYLD_LIBRARY_PATH=$RESOURCES
 PYTHONPATH=$RESOURCES:$FRAMEWORKS:$PYTHONPATH
 DYLD_FRAMEWORK_PATH=$FRAMEWORKS
 DYLD_LIBRARY_PATH=$RESOURCES
 PYTHONPATH=$RESOURCES:$FRAMEWORKS:$PYTHONPATH

-PATH=$RESOURCES:$RESOURCES/sfa/clientbin/:$PATH
+PATH=$RESOURCES:$RESOURCES/clientbin/:$PATH

 
 export DYLD_FRAMEWORK_PATH
 export DYLD_LIBRARY_PATH
 
 export DYLD_FRAMEWORK_PATH
 export DYLD_LIBRARY_PATH