Don't use the pre-built I2P.app to build the bundle anymore, don't use I2P_SIGNER and I2P_CODE_SIGNER anymore because we're not signing the native libs

This commit is contained in:
eyedeekay
2024-01-10 12:45:30 -05:00
parent cf47ac8b61
commit 5015eac337

View File

@ -41,18 +41,6 @@ if [ -z "${JAVA_HOME}" ]; then
JAVA_HOME=$(/usr/libexec/java_home) JAVA_HOME=$(/usr/libexec/java_home)
fi fi
if [ -z "$I2P_SIGNER" ]; then
I2P_SIGNER=$(security find-identity -v -p codesigning | cut -d ' ' -f 4)
echo "Warning: using automatically configured signer ID, make sure this is the one you want: $I2P_SIGNER"
echo "continuing in 10 seconds"
sleep 10
fi
if [ -z "$I2P_CODE_SIGNER" ]; then
I2P_CODE_SIGNER=$(security find-identity -v -p codesigning | cut -d ' ' -f 4)
echo "Warning: using automatically configured signer ID, make sure this is the one you want: $I2P_CODE_SIGNER"
echo "continuing in 10 seconds"
sleep 10
fi
if [ -z "$I2P_SIGNER_USERPHRASE" ]; then if [ -z "$I2P_SIGNER_USERPHRASE" ]; then
I2P_SIGNER_USERPHRASE=$(security find-identity -v -p codesigning | head -n 1 | cut -d '"' -f 2) I2P_SIGNER_USERPHRASE=$(security find-identity -v -p codesigning | head -n 1 | cut -d '"' -f 2)
echo "Warning: using automatically configured signer ID, make sure this is the one you want: $I2P_SIGNER_USERPHRASE" echo "Warning: using automatically configured signer ID, make sure this is the one you want: $I2P_SIGNER_USERPHRASE"
@ -159,20 +147,14 @@ else
fi fi
cp "$HERE"/resources/*.crt I2P.app/Contents/Resources/certificates/router cp "$HERE"/resources/*.crt I2P.app/Contents/Resources/certificates/router
if [ -z "$I2P_SIGNER" ]; then jpackage --name I2P \
echo "I2P_SIGNER is unset, not proceeding to signing phase" --java-options "-Xmx512m" \
exit 0 --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
fi --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
--java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
if [ -z "$I2P_CODE_SIGNER" ]; then --type dmg \
echo "I2P_CODE_SIGNER is unset, not proceeding to signing phase" --verbose \
exit 0 --resource-dir build \
fi
jpackage --name I2P --app-image I2P.app --app-version "$I2P_RELEASE_VERSION" \
--verbose --temp tmp \
--license-file build/LICENSE.txt \
--mac-sign \
--mac-signing-key-user-name "$I2P_SIGNER_USERPHRASE" \ --mac-signing-key-user-name "$I2P_SIGNER_USERPHRASE" \
--mac-entitlements resources/entitlements.xml \ --mac-entitlements resources/entitlements.xml \
--resource-dir build --input build --main-jar launcher.jar --main-class net.i2p.router.MacLauncher