Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MacOS package names and fic another launch script bug

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-04-20 21:43:31 +02:00
parent 221b38c766
commit d78643160c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+4 -4
View File
@@ -79,7 +79,7 @@ jobs:
runs-on: macos-12 runs-on: macos-12
env: env:
PYTHON_VERSION: "3.12" PYTHON_VERSION: "3.12"
ARCHITECTURE: amd64 PACKAGE_ARCH: x86_64
MINICONDA_ARCH: x86_64 MINICONDA_ARCH: x86_64
steps: steps:
- name: Checkout - name: Checkout
@@ -92,7 +92,7 @@ jobs:
path: novelwriter/assets path: novelwriter/assets
- name: Build App Bundle - name: Build App Bundle
run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@@ -107,7 +107,7 @@ jobs:
runs-on: macos-14 runs-on: macos-14
env: env:
PYTHON_VERSION: "3.12" PYTHON_VERSION: "3.12"
ARCHITECTURE: arm64 PACKAGE_ARCH: aarch64
MINICONDA_ARCH: arm64 MINICONDA_ARCH: arm64
steps: steps:
- name: Checkout - name: Checkout
@@ -120,7 +120,7 @@ jobs:
path: novelwriter/assets path: novelwriter/assets
- name: Build App Bundle - name: Build App Bundle
run: ./setup/macos/build.sh $PYTHON_VERSION $ARCHITECTURE $MINICONDA_ARCH run: ./setup/macos/build.sh $PYTHON_VERSION $PACKAGE_ARCH $MINICONDA_ARCH
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
setup/macos/build.sh
+1 -1
View File
@@ -137,8 +137,8 @@ cp $SRC_DIR/setup/macos/novelwriter.icns novelWriter.app/Contents/Resources/
# Create entry script # Create entry script
echo "Creating entry script ..." echo "Creating entry script ..."
cat > novelWriter.app/Contents/MacOS/novelWriter << EOF cat > novelWriter.app/Contents/MacOS/novelWriter << EOF
DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
#!/bin/bash #!/bin/bash
DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
\$DIR/../Resources/bin/python -sE \$DIR/../Resources/novelWriter/novelWriter.py \$@ \$DIR/../Resources/bin/python -sE \$DIR/../Resources/novelWriter/novelWriter.py \$@
EOF EOF