diff --git a/alfred-pwd-gen b/alfred-pwd-gen deleted file mode 100755 index e69de29..0000000 diff --git a/info.plist b/info.plist index 9fd3a57..f401b9d 100644 --- a/info.plist +++ b/info.plist @@ -79,7 +79,7 @@ runningsubtext script - ./dist/main/main $@ + /usr/bin/python3 ./dist/main.py $@ scriptargtype 1 scriptfile @@ -125,7 +125,7 @@ variablesdontexport version - 1.6.0 + 1.7.0 webaddress https://github.com/fedecalendino/alfred-pwd-gen diff --git a/pyproject.toml b/pyproject.toml index 7766bd2..3e678d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "Password Generator" -version = "1.6.0" +version = "1.7.0" description = "Generate secure passwords" documentation = "https://github.com/fedecalendino/alfred-pwd-gen/blob/main/README.md" homepage = "https://github.com/fedecalendino/alfred-pwd-gen" @@ -16,7 +16,6 @@ alfred-pyflow = "latest" [tool.poetry.dev-dependencies] black = "22.10.0" -pyinstaller = "5.5" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/scripts/build.sh b/scripts/build.sh index 54a25d2..f17f957 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,24 +1,19 @@ -function build() { - echo "Generating $1 binary" - echo - - poetry run pyinstaller --onedir --paths ./src/ "src/$1.py" 1> /dev/null - - echo "Workspace cleanup" - echo +rm -rf "./dist/" - rm "./$1.spec" - rm -rf "./build/" +echo "Copy dependencies" +cp -r $(find .venv | egrep "site-packages$") ./dist - echo - echo "Finished generating bin file for $1" - echo -} +echo "Clean up dist folder" +cd dist +ls -d */ | grep info | xargs rm -rf +ls | egrep "^\_.*" | xargs rm -rf +rm -rf *.so black blackd blib2to3 distutils* pkg_resources pip* setuptools* wheel* -rm -rf "./dist/" +cd .. -build main +echo "Copy source code" +cp -r ./src/* dist echo "Finished" echo