fixed .dmg drag and drop installer

cole-wilson · Feb 1, 2021 · 375e889 · 375e889
1 parent 0185a9c
commit 375e889
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 10 deletions.
diff --git a/dist/homebrew/Sailboat.rb b/dist/homebrew/Sailboat.rb
@@ -1,6 +1,6 @@
 # Created with sailboat, the Python releaser
 
-# v0.24.10
+# v0.24.11
 
 class Sailboat < Formula
   include Language::Python::Virtualenv

diff --git a/dist/pypi/sailboat-0.24.10.tar.gz b/dist/pypi/sailboat-0.24.10.tar.gz
diff --git a/dist/pypi/sailboat-0.24.10-py3-none-any.whl → dist/pypi/sailboat-0.24.11-py3-none-any.whl b/dist/pypi/sailboat-0.24.10-py3-none-any.whl → dist/pypi/sailboat-0.24.11-py3-none-any.whl
diff --git a/dist/pypi/sailboat-0.24.11.tar.gz b/dist/pypi/sailboat-0.24.11.tar.gz
diff --git a/sailboat.egg-info/PKG-INFO b/sailboat.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sailboat
-Version: 0.24.10
+Version: 0.24.11
 Summary: A quick and easy way to distribute your Python projects!
 Home-page: https://github.com/cole-wilson/sailboat
 Author: Cole Wilson

diff --git a/sailboat.toml b/sailboat.toml
@@ -13,10 +13,10 @@ description = ""
 url = "https://github.com/cole-wilson/sailboat"
 keywords = ""
 license = "MIT"
-latest_build = "0.24.10"
+latest_build = "0.24.11"
 author = "Cole Wilson"
-latest_release = "0.24.9"
-release-notes = "a"
+latest_release = "0.24.10"
+release-notes = "fixed dd -> ddimage"
 
 
 # Resource Setup:

diff --git a/sailboat/__init__.py b/sailboat/__init__.py
@@ -1,4 +1,5 @@
-__version__ = "0.24.10"  # Added by Sailboat
+__version__ = "0.24.11"  # Added by Sailboat
+
 
 
 

diff --git a/sailboat/__pycache__/__init__.cpython-38.pyc b/sailboat/__pycache__/__init__.cpython-38.pyc
diff --git a/sailboat/__pycache__/builders.cpython-38.pyc b/sailboat/__pycache__/builders.cpython-38.pyc
diff --git a/sailboat/builders.py b/sailboat/builders.py
@@ -341,7 +341,7 @@ def run(self,**kwargs):
 				version=self.version,
 				icns="" if not "icns" in self.data['resources'] else	self.data['resources']['icns'],
 				keywo=", ".join(self.data['keywords']),
-				ddimage=self.prefix + 'dragdrop.png'
+				ddimage=self.prefix + 'resources' + os.sep + 'dragdrop.png'
 			))
 			os.system(f'cat build/settings.py;dmgbuild -s .{os.sep}build{os.sep}settings.py "{self.data["name"]} Installer" ./dist/pyinstaller/{self.data["short_name"]+"-"+self.version+"-macos"}.dmg')
 

diff --git a/sailboat/resources/settings.py.template b/sailboat/resources/settings.py.template
@@ -19,10 +19,10 @@ files = [ './dist/pyinstaller/{name}.app' ]
 symlinks = {{ 'Applications': '/Applications' }}
 badge_icon = '{icns}'
 icon_locations = {{
-    '{name}.app': (400, 100),
+    '{name}.app': (200, 100),
     'Applications': (200, 300)
 }}
-# background = "{ddimage}"
+background = "{ddimage}"
 show_status_bar = False
 show_tab_view = False
 show_toolbar = False

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 
 options = {
 	"name":"sailboat",
-	"version":"0.24.10",
+	"version":"0.24.11",
 	"scripts":[],
 	"entry_points":{'console_scripts': ['sail=sailboat.__main__:main', 'sailboat=sailboat.__main__:main'], 'sailboat_plugins': ['quickstart=sailboat.core:QuickStart', 'pypi=sailboat.builders:PyPi', 'homebrew=sailboat.builders:Homebrew', 'pyinstaller=sailboat.builders:PyInstaller', 'dev=sailboat.core:Develop', 'release=sailboat.core:Release', 'build=sailboat.build:Build', 'wizard=sailboat.core:Wizard', 'remove=sailboat.core:Remove', 'add=sailboat.core:Add', 'plugins=sailboat.core:ManagePlugins', 'git=sailboat.core:Git', 'tasks=sailboat.other:Tasks', 'workflow=sailboat.core:Actions', 'github=sailboat.core:Git', 'github_release=sailboat.core:GithubRelease', 'build_docs_readme=sailboat.other:BuildDocs', 'setcodeversion=sailboat.other:SetVersion']},
 	"author":"Cole Wilson",
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,5 @@
		__version__ = "0.24.10" # Added by Sailboat
		__version__ = "0.24.11" # Added by Sailboat




Expand Down