X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=macos%2Fbuild-dmg.sh;h=323ab8f89f627d4217c3908e43bfb18920cc8f2b;hp=803b3d54cc4d7231a25efa90ac3f56e4de707930;hb=beab7d44ca4dd2a79bbb41befe64bdfb145fbb82;hpb=90036e8d857f31b53cc89685ee3b0f9a0024b7e2 diff --git a/macos/build-dmg.sh b/macos/build-dmg.sh index 803b3d5..323ab8f 100755 --- 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 @@ -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 - 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