[adonthell-wastesedge-commits] master 6327aa1 2/2: Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/adonthell/adonthell-wastesedge

[Kai Sterker]

branch: master
commit 6327aa1be019b6348eaabd40eaf8f48243a2666f
Merge: 0bb7b42 e5e7719
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    Merge branch 'master' of 
ssh://git.sv.gnu.org/srv/git/adonthell/adonthell-wastesedge
---
 osx/make_dmg.sh | 20 +++++++++++---------
 osx/settings.py |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osx/make_dmg.sh b/osx/make_dmg.sh
index 4a9fe3b..cc65ddc 100755
--- a/osx/make_dmg.sh
+++ b/osx/make_dmg.sh
@@ -8,8 +8,11 @@ if test "x$1" = "x" ; then
   exit 1
 fi
 
-if test ! -f $1"/Contents/MacOS/$adonthell_exe" ; then
-  echo "Error: $1 is not the expected App bundle"
+# -- remove traiing slash, if present
+bundle=${1%/}
+
+if test ! -f $bundle"/Contents/MacOS/$adonthell_exe" ; then
+  echo "Error: $bundle is not the expected App bundle"
   exit 1
 fi
 
@@ -27,23 +30,22 @@ if [ ! -x "$(command -v dmgbuild)" ]; then
 fi
 
 # -- get adonthell version
-adonthell_ver=`$1/Contents/MacOS/$adonthell_exe -v`
+adonthell_ver=`$bundle/Contents/MacOS/$adonthell_exe -v`
 
 # -- codesign Adonthell.App
 if [ ! -z "$CODESIGN_IDENTITY" ]; then
-  echo "Signing $1 as $CODESIGN_IDENTITY"
-  codesign -s "$CODESIGN_IDENTITY" --force --deep $1
+  echo "Signing $bundle as $CODESIGN_IDENTITY"
+  codesign -s "$CODESIGN_IDENTITY" --force --deep $bundle
 else
   echo "CODESIGN_IDENTITY not defined. Will not sign Adonthell.app"
 fi
 
-echo "Creating wastesedge-osx-x86_64-$adonthell_ver.dmg (as root)"
+echo "Creating wastesedge-osx-x86_64-$adonthell_ver.dmg"
 
 # -- clean up any __pycache__ directories before collecting package contents
-find $1 -name __pycache__ -execdir rm -rf __pycache__ \;
+find $bundle -name __pycache__ -execdir rm -rf __pycache__ \;
 
-sudo dmgbuild -s settings.py -Dapp=$1 "Adonthell - Waste's Edge" 
wastesedge-osx-x86_64-$adonthell_ver.dmg
-sudo chown $USER wastesedge-osx-x86_64-$adonthell_ver.dmg
+dmgbuild -s settings.py -Dapp=$bundle "Adonthell - Waste's Edge" 
wastesedge-osx-x86_64-$adonthell_ver.dmg
 
 # -- codesign diskimage (requires OSX 10.11.4 or later)
 if [ ! -z "$CODESIGN_IDENTITY" ]; then
diff --git a/osx/settings.py b/osx/settings.py
index 6f6055d..24534dc 100644
--- a/osx/settings.py
+++ b/osx/settings.py
@@ -42,7 +42,7 @@ def icon_from_app(app_path):
 format = defines.get('format', 'UDBZ') 
 
 # Volume size (must be large enough for your files)
-size = defines.get('size', '25M')
+size = defines.get('size', '32M')
 
 # Files to include
 files = [ application, '../User Manual.pdf' ]
@@ -57,7 +57,7 @@ symlinks = { 'Applications': '/Applications' }
 # will be used to badge the system's Removable Disk icon
 #
 #icon = '/path/to/icon.icns'
-badge_icon = icon_from_app(application)
+#badge_icon = icon_from_app(application)
 
 # Where to put the icons
 icon_locations = {