diff --git a/packaging/osx/lbry-osx-app/app.icns b/packaging/osx/lbry-osx-app/app.icns index b4d00d2f2..199a1b59d 100644 Binary files a/packaging/osx/lbry-osx-app/app.icns and b/packaging/osx/lbry-osx-app/app.icns differ diff --git a/packaging/osx/lbry-osx-app/dmg_background.png b/packaging/osx/lbry-osx-app/dmg_background.png new file mode 100644 index 000000000..de4422b1d Binary files /dev/null and b/packaging/osx/lbry-osx-app/dmg_background.png differ diff --git a/packaging/osx/lbry-osx-app/dmg_settings.py b/packaging/osx/lbry-osx-app/dmg_settings.py new file mode 100644 index 000000000..c7729d2c5 --- /dev/null +++ b/packaging/osx/lbry-osx-app/dmg_settings.py @@ -0,0 +1,11 @@ +badge_icon = 'app.icns' +icon_locations = { + 'LBRY.app': (115, 164), + 'Applications': (387, 164) +} +background='dmg_background.png' +default_view='icon-view' +symlinks = { 'Applications': '/Applications' } +window_rect=((200, 200), (500, 320)) +files = [ 'LBRY.app' ] +icon_size=128 diff --git a/packaging/osx/lbry-osx-app/setup_app.sh b/packaging/osx/lbry-osx-app/setup_app.sh index 7d91f0447..785c4a1bd 100755 --- a/packaging/osx/lbry-osx-app/setup_app.sh +++ b/packaging/osx/lbry-osx-app/setup_app.sh @@ -9,10 +9,9 @@ ON_TRAVIS=false rm -rf build dist LBRY.app -pip install wheel +pip install wheel dmgbuild jsonrpc # the default py2app (v0.9) has a bug that is fixed in the head of /metachris/py2app pip install git+https://github.com/metachris/py2app -pip install jsonrpc mkdir -p $tmp cd $tmp @@ -73,7 +72,7 @@ fi # LBRYCRDD_URL="$(curl https://api.github.com/repos/lbryio/lbrycrd/releases/latest | grep 'browser_download_url' | grep osx | cut -d'"' -f4)" LBRYCRDD_URL="https://github.com/lbryio/lbrycrd/releases/download/v0.3.15/lbrycrd-osx.zip" wget "${LBRYCRDD_URL}" --output-document lbrycrd-osx.zip -unzip lbrycrd-osx.zip +unzip -o lbrycrd-osx.zip python setup_app.py py2app --resources lbrycrdd chmod +x "${DEST}/dist/LBRY.app/Contents/Resources/lbrycrdd" @@ -105,5 +104,4 @@ codesign -vvvv "${DEST}/dist/LBRY.app" rm -rf $tmp mv dist/LBRY.app LBRY.app rm -rf dist "${NAME}.${VERSION}.dmg" -# TODO: make this pretty! -hdiutil create "${NAME}.${VERSION}.dmg" -volname lbry -srcfolder LBRY.app +dmgbuild -s dmg_settings.py "LBRY" "${NAME}.${VERSION}.dmg"