Skip to content

Commit

Permalink
rename alphaDIA -> alphadia
Browse files Browse the repository at this point in the history
  • Loading branch information
mschwoer committed Sep 10, 2024
1 parent 06bf4f2 commit a99e650
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion release/macos/build_package_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e -u

# Set up package name and version
PACKAGE_NAME="alphadia"
APP_NAME="alphaDIA"
APP_NAME="alphadia"
PACKAGE_VERSION="1.7.2"
PKG_FOLDER="dist/$APP_NAME.app"

Expand Down
8 changes: 4 additions & 4 deletions release/macos/build_pkg_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ KERNEL=$(uname -s | tr '[:upper:]' '[:lower:]')

BUILD_NAME="${PACKAGE_NAME}-${PACKAGE_VERSION}-${KERNEL}-${ARCH}"

PKG_FOLDER="dist/alphaDIA.app"
PKG_FOLDER="dist/alphadia.app"

# Cleanup the package folder
echo "Cleaning up the package folder"
Expand Down Expand Up @@ -68,11 +68,11 @@ cp -a ${GUI_BUILD}/. $PKG_FOLDER/Contents/Frameworks/
echo "Copying resources"
cp release/logos/alphadia.icns $PKG_FOLDER/Contents/Resources/
cp release/logos/alphadia.png $PKG_FOLDER/Contents/Resources/
cp release/macos/alphaDIA $PKG_FOLDER/Contents/MacOS/
cp release/macos/alphadia $PKG_FOLDER/Contents/MacOS/

cp release/macos/Info.plist $PKG_FOLDER/Contents/

#change permissions for entry script
chmod +x $PKG_FOLDER/Contents/MacOS/alphaDIA
chmod +x $PKG_FOLDER/Contents/MacOS/alphadia

pkgbuild --root $PKG_FOLDER --identifier de.mpg.biochem.alphadia.app --version $PACKAGE_VERSION --install-location /Applications/alphaDIA.app --scripts release/macos/scripts dist/$BUILD_NAME.pkg --nopayload
pkgbuild --root $PKG_FOLDER --identifier de.mpg.biochem.alphadia.app --version $PACKAGE_VERSION --install-location /Applications/alphadia.app --scripts release/macos/scripts dist/$BUILD_NAME.pkg --nopayload
10 changes: 5 additions & 5 deletions release/macos/distribution.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-script minSpecVersion="1.000000">
<title>alphaDIA 1.7.2</title>
<title>AlphaDIA 1.7.2</title>
<background mime-type="image/png" file="alphadia.png" scaling="proportional"/>
<welcome file="welcome.html" mime-type="text/html" />
<conclusion file="conclusion.html" mime-type="text/html" />
<license file="LICENSE.txt"/>
<options customize="never" allow-external-scripts="no"/>
<domains enable_localSystem="true" />
<choices-outline>
<line choice="alphaDIA"/>
<line choice="alphadia"/>
</choices-outline>
<choice id="alphaDIA" title="alphaDIA">
<pkg-ref id="alphaDIA.pkg"/>
<choice id="alphadia" title="alphadia">
<pkg-ref id="alphadia.pkg"/>
</choice>
<pkg-ref id="alphaDIA.pkg" auth="Root">alphaDIA.pkg</pkg-ref>
<pkg-ref id="alphadia.pkg" auth="Root">alphadia.pkg</pkg-ref>
</installer-script>
6 changes: 3 additions & 3 deletions release/macos/info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>alphaDIA</string>
<string>AlphaDIA</string>
<key>CFBundleExecutable</key>
<string>alphaDIA</string>
<string>alphadia</string>
<key>CFBundleIconFile</key>
<string>alphadia.icns</string>
<key>CFBundleIdentifier</key>
Expand All @@ -15,7 +15,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>alphaDIA</string>
<string>alphadia</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>LSBackgroundOnly</key>
Expand Down
4 changes: 2 additions & 2 deletions release/macos/scripts/postinstall
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

# make sure this file itself is executable
xattr -dr com.apple.quarantine /Applications/alphaDIA.app
chmod -R 577 /Applications/alphaDIA.app
xattr -dr com.apple.quarantine /Applications/alphadia.app
chmod -R 577 /Applications/alphadia.app
echo "Postinstall finished"
2 changes: 1 addition & 1 deletion release/pyinstaller/cli_hook.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from alphadia import cli

# catch pyinstaller bug
# subprocess.CalledProcessError: Command '['/Applications/alphaDIA.app/Contents/Frameworks/alphadia', '-sS', '-c', 'import platform; print(platform.mac_ver()[0])']' returned non-zero exit status 2.
# subprocess.CalledProcessError: Command '['/Applications/alphadia.app/Contents/Frameworks/alphadia', '-sS', '-c', 'import platform; print(platform.mac_ver()[0])']' returned non-zero exit status 2.
# [36481] Failed to execute script 'cli_hook' due to unhandled exception!
if len(sys.argv) >= 3 and (sys.argv[1] == "-sS") and (sys.argv[2] == "-c"):
import platform
Expand Down

0 comments on commit a99e650

Please sign in to comment.