diff --git a/contrib/build-linux/appimage/apprun.sh b/contrib/build-linux/appimage/apprun.sh index 134323530..5c95ba527 100755 --- a/contrib/build-linux/appimage/apprun.sh +++ b/contrib/build-linux/appimage/apprun.sh @@ -8,4 +8,4 @@ export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/x86_64-linux-gnu${L export PATH="${APPDIR}/usr/bin:${PATH}" export LDFLAGS="-L${APPDIR}/usr/lib/x86_64-linux-gnu -L${APPDIR}/usr/lib" -exec "${APPDIR}/usr/bin/python3" -s "${APPDIR}/usr/bin/electrum" "$@" +exec "${APPDIR}/usr/bin/python3" -s "${APPDIR}/usr/bin/electrum-purple" "$@" diff --git a/contrib/build-wine/electrum-purple.nsi b/contrib/build-wine/electrum-purple.nsi index 5abb01520..368ba4aba 100644 --- a/contrib/build-wine/electrum-purple.nsi +++ b/contrib/build-wine/electrum-purple.nsi @@ -179,14 +179,14 @@ Section ;Create desktop shortcut DetailPrint "Creating desktop shortcut..." - CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" "" + CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-purple-${PRODUCT_VERSION}.exe" "" ;Create start-menu items DetailPrint "Creating start-menu items..." CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" 0 - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-purple-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-purple-${PRODUCT_VERSION}.exe" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-purple-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-purple-${PRODUCT_VERSION}.exe" 0 ;Links bitcoin:, lightning: and lnurl LUD-17 URIs to Electrum diff --git a/electrum/gui/qml/java_classes/org/electrum/biometry/BiometricActivity.java b/electrum/gui/qml/java_classes/org/electrum/biometry/BiometricActivity.java index acf94e8fc..b561db608 100644 --- a/electrum/gui/qml/java_classes/org/electrum/biometry/BiometricActivity.java +++ b/electrum/gui/qml/java_classes/org/electrum/biometry/BiometricActivity.java @@ -22,7 +22,7 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; -import org.electrum.electrum.res.R; +import org.electrumpurple.electrum_purple.res.R; public class BiometricActivity extends Activity { private static final String TAG = "BiometricActivity"; @@ -54,7 +54,7 @@ public class BiometricActivity extends Activity { Executor executor = getMainExecutor(); BiometricPrompt biometricPrompt = new BiometricPrompt.Builder(this) - .setTitle("Electrum Wallet") + .setTitle("Electrum Purple") .setAllowedAuthenticators(BiometricManager.Authenticators.BIOMETRIC_STRONG | BiometricManager.Authenticators.DEVICE_CREDENTIAL) .setSubtitle(authMessage) .build(); diff --git a/electrum/gui/qml/java_classes/org/electrum/qr/SimpleScannerActivity.java b/electrum/gui/qml/java_classes/org/electrum/qr/SimpleScannerActivity.java index 476c375c4..a112ef595 100644 --- a/electrum/gui/qml/java_classes/org/electrum/qr/SimpleScannerActivity.java +++ b/electrum/gui/qml/java_classes/org/electrum/qr/SimpleScannerActivity.java @@ -27,7 +27,7 @@ import de.markusfisch.android.zxingcpp.ZxingCpp.Result; import de.markusfisch.android.zxingcpp.ZxingCpp.ContentType; -import org.electrum.electrum.res.R; // package set in build.gradle +import org.electrumpurple.electrum_purple.res.R; // package set in build.gradle public class SimpleScannerActivity extends Activity { private static final int MY_PERMISSIONS_CAMERA = 1002; diff --git a/run_electrum b/run_electrum index 42f77a3c3..3e324750c 100755 --- a/run_electrum +++ b/run_electrum @@ -47,7 +47,7 @@ is_appimage = 'APPIMAGE' in os.environ is_binary_distributable = is_pyinstaller or is_android or is_appimage # is_local: unpacked tar.gz but not pip installed, or git clone is_local = (not is_binary_distributable - and os.path.exists(os.path.join(script_dir, "electrum.desktop"))) + and os.path.exists(os.path.join(script_dir, "electrum-purple.desktop"))) is_git_clone = is_local and os.path.exists(os.path.join(script_dir, ".git")) if is_git_clone: