More renaming

Deactivate plugins

Author: wilsonmeier

MANIFEST.in

@@ -1,9 +1,9 @@
 include LICENCE RELEASE-NOTES AUTHORS
 include README.rst
-include electrum-gold.conf.sample
-include electrum-gold.desktop
+include electrumg.conf.sample
+include electrumg.desktop
 include *.py
-include electrum-gold
+include electrumg
 include contrib/requirements/requirements.txt
 include contrib/requirements/requirements-hw.txt
 recursive-include lib *.py

contrib/build-osx/make_osx

@@ -20,7 +20,7 @@ VERSION=`git describe --tags`
 # Paramterize
 PYTHON_VERSION=3.6.4
 BUILDDIR=/tmp/electrum-build
-PACKAGE=ElectrumGold
+PACKAGE=ElectrumG
 GIT_REPO=https://github.com/BTCGPU/electrum
 
 
@@ -70,9 +70,9 @@ python3 -m pip install -Ir ./contrib/deterministic-build/requirements.txt --user
 python3 -m pip install -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \
 fail "Could not install requirements"
 
-info "Installing hardware wallet requirements..."
-python3 -m pip install -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
-fail "Could not install hardware wallet requirements"
+#info "Installing hardware wallet requirements..."
+#python3 -m pip install -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
+#fail "Could not install hardware wallet requirements"
 
 info "Building $PACKAGE..."
 python3 setup.py install --user > /dev/null || fail "Could not build $PACKAGE"
@@ -88,4 +88,4 @@ info "Building binary"
 pyinstaller --noconfirm --ascii --name $VERSION contrib/build-osx/osx.spec || fail "Could not build binary"
 
 info "Creating .DMG"
-hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrum-gold-$VERSION.dmg || fail "Could not create .DMG"
+hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrumg-$VERSION.dmg || fail "Could not create .DMG"

contrib/build-osx/osx.spec

@@ -5,10 +5,10 @@ from PyInstaller.utils.hooks import collect_data_files, collect_submodules, coll
 import sys
 import os
 
-PACKAGE='ElectrumGold'
-PYPKG='electrum-gold'
-MAIN_SCRIPT='electrum-gold'
-ICONS_FILE='electrum-gold.icns'
+PACKAGE='ElectrumG'
+PYPKG='electrumg'
+MAIN_SCRIPT='electrumg'
+ICONS_FILE='electrumg.icns'
 
 for i, x in enumerate(sys.argv):
     if x == '--name':

contrib/build-wine/build-electrum-git.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NAME_ROOT=electrum-gold
+NAME_ROOT=electrumg
 PYTHON_VERSION=3.5.4
 
 # These settings probably don't need any change
@@ -49,18 +49,18 @@ echo "Last commit: $VERSION"
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
-rm -rf $WINEPREFIX/drive_c/electrum-gold
-cp -r electrum $WINEPREFIX/drive_c/electrum-gold
+rm -rf $WINEPREFIX/drive_c/electrumg
+cp -r electrum $WINEPREFIX/drive_c/electrumg
 cp electrum/LICENCE .
-cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrum-gold/lib/
-cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum-gold/gui/qt/
+cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrumg/lib/
+cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrumg/gui/qt/
 
 # Install frozen dependencies
 $PYTHON -m pip install -r ../../deterministic-build/requirements.txt
 
 $PYTHON -m pip install -r ../../deterministic-build/requirements-hw.txt
 
-pushd $WINEPREFIX/drive_c/electrum-gold
+pushd $WINEPREFIX/drive_c/electrumg
 $PYTHON setup.py install
 popd
 
@@ -81,7 +81,7 @@ popd
 wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum.nsi
 
 cd dist
-mv electrum-gold-setup.exe $NAME_ROOT-$VERSION-setup.exe
+mv electrumg-setup.exe $NAME_ROOT-$VERSION-setup.exe
 cd ..
 
 echo "Done."

contrib/build-wine/deterministic.spec

@@ -11,7 +11,7 @@ else:
     raise BaseException('no name')
 
 
-home = 'C:\\electrum-gold\\'
+home = 'C:\\electrumg\\'
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
 hiddenimports = []
@@ -42,7 +42,7 @@ datas += collect_data_files('btchip')
 datas += collect_data_files('keepkeylib')
 
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
-a = Analysis([home+'electrum-gold',
+a = Analysis([home+'electrumg',
               home+'gui/qt/main_window.py',
               home+'gui/text.py',
               home+'lib/util.py',
@@ -86,11 +86,11 @@ exe_standalone = EXE(
     a.scripts,
     a.binaries,
     a.datas, 
-    name=os.path.join('build\\pyi.win32\\electrum-gold', cmdline_name + ".exe"),
+    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name + ".exe"),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrum-gold.ico',
+    icon=home+'icons/electrumg.ico',
     console=False)
     # console=True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used
 
@@ -99,11 +99,11 @@ exe_portable = EXE(
     a.scripts,
     a.binaries,
     a.datas + [ ('is_portable', 'README.md', 'DATA' ) ],
-    name=os.path.join('build\\pyi.win32\\electrum-gold', cmdline_name + "-portable.exe"),
+    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name + "-portable.exe"),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrum-gold.ico',
+    icon=home+'icons/electrumg.ico',
     console=False)
 
 #####
@@ -113,11 +113,11 @@ exe_dependent = EXE(
     pyz,
     a.scripts,
     exclude_binaries=True,
-    name=os.path.join('build\\pyi.win32\\electrum-gold', cmdline_name),
+    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrum-gold.ico',
+    icon=home+'icons/electrumg.ico',
     console=False)
 
 coll = COLLECT(
@@ -128,6 +128,6 @@ coll = COLLECT(
     strip=None,
     upx=True,
     debug=False,
-    icon=home+'icons/electrum-gold.ico',
+    icon=home+'icons/electrumg.ico',
     console=False,
-    name=os.path.join('dist', 'electrum-gold'))
+    name=os.path.join('dist', 'electrumg'))

contrib/build-wine/electrum.nsi

@@ -6,7 +6,7 @@
 ;--------------------------------
 ;Variables
 
-  !define PRODUCT_NAME "Electrum Gold"
+  !define PRODUCT_NAME "ElectrumG"
   !define PRODUCT_WEB_SITE "https://github.com/BTCGPU/electrum"
   !define PRODUCT_PUBLISHER "BitcoinGold Organization"
   !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -16,7 +16,7 @@
 
   ;Name and file
   Name "${PRODUCT_NAME}"
-  OutFile "dist/electrum-gold-setup.exe"
+  OutFile "dist/electrumg-setup.exe"
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
@@ -72,7 +72,7 @@
   !define MUI_ABORTWARNING
   !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
 
-  !define MUI_ICON "tmp\electrum\icons\electrum-gold.ico"
+  !define MUI_ICON "tmp\electrum\icons\electrumg.ico"
 
 ;--------------------------------
 ;Pages
@@ -110,8 +110,8 @@ Section
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*"
 
   ;Files to pack into the installer
-  File /r "dist\electrum-gold\*.*"
-  File "..\..\icons\electrum-gold.ico"
+  File /r "dist\electrumg\*.*"
+  File "..\..\icons\electrumg.ico"
 
   ;Store installation folder
   WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR
@@ -122,29 +122,29 @@ Section
 
   ;Create desktop shortcut
   DetailPrint "Creating desktop shortcut..."
-  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-gold-${PRODUCT_VERSION}.exe" ""
+  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${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-gold-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-gold-${PRODUCT_VERSION}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-gold-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-gold-${PRODUCT_VERSION}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" 0
 
 
-  ;Links bitcoingold: URI's to ElectrumGold
+  ;Links bitcoingold: URI's to ElectrumG
   WriteRegStr HKCU "Software\Classes\bitcoingold" "" "URL:bitcoingold Protocol"
   WriteRegStr HKCU "Software\Classes\bitcoingold" "URL Protocol" ""
-  WriteRegStr HKCU "Software\Classes\bitcoingold" "DefaultIcon" "$\"$INSTDIR\electrum-gold.ico, 0$\""
-  WriteRegStr HKCU "Software\Classes\bitcoingold\shell\open\command" "" "$\"$INSTDIR\electrum-gold-${PRODUCT_VERSION}.exe$\" $\"%1$\""
+  WriteRegStr HKCU "Software\Classes\bitcoingold" "DefaultIcon" "$\"$INSTDIR\electrumg.ico, 0$\""
+  WriteRegStr HKCU "Software\Classes\bitcoingold\shell\open\command" "" "$\"$INSTDIR\electrumg-${PRODUCT_VERSION}.exe$\" $\"%1$\""
 
   ;Adds an uninstaller possibilty to Windows Uninstall or change a program section
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrum-gold.ico"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrumg.ico"
 
   ;Fixes Windows broken size estimates
   ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2

contrib/freeze_packages.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Run this after a new release to update dependencies
 
-venv_dir=~/.electrum-venv
+venv_dir=~/.electrumg-venv
 contrib=$(dirname "$0")
 
 which virtualenv > /dev/null 2>&1 || { echo "Please install virtualenv" && exit 1; }
@@ -16,7 +16,7 @@ for i in '' '-hw' '-binaries'; do
 
     python -m pip install -r $contrib/requirements/requirements${i}.txt --upgrade
 
-    pip freeze | sed '/^Electrum/ d' > $contrib/deterministic-build/requirements${i}.txt
+    pip freeze | sed '/^ElectrumG/ d' > $contrib/deterministic-build/requirements${i}.txt
 done
 
 echo "Done. Updated requirements"

contrib/make_download

@@ -27,8 +27,8 @@ os.system(cmd)
 
 os.chdir('lib')
 
-crowdin_identifier = 'electrum'
-crowdin_file_name = 'files[electrum-client/messages.pot]'
+crowdin_identifier = 'electrumg'
+crowdin_file_name = 'files[electrumg-client/messages.pot]'
 locale_file_name = 'locale/messages.pot'
 crowdin_api_key = None
 
@@ -60,7 +60,7 @@ zfobj = zipfile.ZipFile(io.BytesIO(s))
 
 print('Unzip translations')
 for name in zfobj.namelist():
-    if not name.startswith('electrum-client/locale'):
+    if not name.startswith('electrumg-client/locale'):
         continue
     if name.endswith('/'):
         if not os.path.exists(name[16:]):

contrib/make_locale

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- mode: python -*-
 #
-# ElectrumGold - lightweight BitcoinGold client
+# ElectrumG - lightweight BitcoinGold client
 # Copyright (C) 2011 thomasv@gitorious
 # Copyright (C) 2018 [email protected]
 #
@@ -44,7 +44,7 @@ if jnius:
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 is_bundle = getattr(sys, 'frozen', False)
-is_local = not is_bundle and os.path.exists(os.path.join(script_dir, "electrum-gold.desktop"))
+is_local = not is_bundle and os.path.exists(os.path.join(script_dir, "electrumg.desktop"))
 is_android = 'ANDROID_DATA' in os.environ
 
 # move this back to gui/kivy/__init.py once plugins are moved
@@ -194,7 +194,7 @@ def init_daemon(config_options):
     storage = WalletStorage(config.get_wallet_path())
     if not storage.file_exists():
         print_msg("Error: Wallet file not found.")
-        print_msg("Type 'electrum-gold create' to create a new wallet, or provide a path to a wallet with the -w option")
+        print_msg("Type 'electrumg create' to create a new wallet, or provide a path to a wallet with the -w option")
         sys.exit(0)
     if storage.is_encrypted():
         if storage.is_encrypted_with_hw_device():
@@ -232,7 +232,7 @@ def init_cmdline(config_options, server):
 
     if cmd.requires_wallet and not storage.file_exists():
         print_msg("Error: Wallet file not found.")
-        print_msg("Type 'electrum-gold create' to create a new wallet, or provide a path to a wallet with the -w option")
+        print_msg("Type 'electrumg create' to create a new wallet, or provide a path to a wallet with the -w option")
         sys.exit(0)
 
     # important warning
@@ -398,7 +398,7 @@ if __name__ == '__main__':
         config_options['portable'] = True
 
     if config_options.get('portable'):
-        config_options['electrum-gold_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum-gold_data')
+        config_options['electrumg_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrumg_data')
 
     # kivy sometimes freezes when we write to sys.stderr
     set_verbosity(config_options.get('verbose') and config_options.get('gui')!='kivy')

electrum-gold renamed to electrumg

@@ -21,6 +21,6 @@ fi
 
 export PYTHONPATH="/usr/local/lib/python${PYTHON_VER}/site-packages:$PYTHONPATH"
 
-./electrum-gold "$@"
+./electrumg "$@"
 
 deactivate

electrum-gold-env renamed to electrumg-env

@@ -1,10 +1,10 @@
 # Configuration file for the electrum client
 # Settings defined here are shared across wallets
 #
-# copy this file to /etc/electrum-gold.conf if you want read-only settings
+# copy this file to /etc/electrumg.conf if you want read-only settings
 
 [client]
-server = electrum-gold.novit.ro:50001:t
+server = electrumg.novit.ro:50001:t
 proxy = None
 gap_limit = 5
 # booleans use python syntax