Merge pull request #24 from BSHA3/contrib/bitcoin-to-bsha3

contrib: bitcoin instances (for user, group, and datadir) to bsha3

contrib/devtools/update-translations.py

@@ -31,7 +31,7 @@
 # Minimum number of messages for translation to be considered at all
 MIN_NUM_MESSAGES = 10
 # Regexp to check for BSHA3 addresses
-ADDRESS_REGEXP = re.compile('([13]|bc1)[a-zA-Z0-9]{30,}')
+ADDRESS_REGEXP = re.compile('([13ac]|bc1|bsha31)[a-zA-Z0-9]{30,}')
 
 def check_at_repository_root():
     if not os.path.exists('.git'):
@@ -126,7 +126,7 @@ def escape_cdata(text):
 
 def contains_bitcoin_addr(text, errors):
     if text != None and ADDRESS_REGEXP.search(text) != None:
-        errors.append('Translation "%s" contains a bitcoin address. This will be removed.' % (text))
+        errors.append('Translation "%s" contains a bsha3 or bitcoin address. This will be removed.' % (text))
         return True
     return False
 

contrib/init/bsha3d.conf

@@ -4,8 +4,8 @@ start on runlevel [2345]
 stop on starting rc RUNLEVEL=[016]
 
 env BITCOIND_BIN="/usr/bin/bsha3d"
-env BITCOIND_USER="bitcoin"
-env BITCOIND_GROUP="bitcoin"
+env BITCOIND_USER="bsha3"
+env BITCOIND_GROUP="bsha3"
 env BITCOIND_PIDDIR="/var/run/bsha3d"
 # upstart can't handle variables constructed with other variables
 env BITCOIND_PIDFILE="/var/run/bsha3d/bsha3d.pid"

contrib/init/bsha3d.openrc

@@ -2,8 +2,8 @@
 
 # backward compatibility for existing gentoo layout 
 #
-if [ -d "/var/lib/bitcoin/.bitcoin" ]; then
-	BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoin/.bitcoin"
+if [ -d "/var/lib/bsha3/.bsha3" ]; then
+	BITCOIND_DEFAULT_DATADIR="/var/lib/bsha3/.bsha3"
 else
 	BITCOIND_DEFAULT_DATADIR="/var/lib/bsha3d"
 fi
@@ -12,8 +12,8 @@ BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bsha3/bitcoin.conf}
 BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bsha3d}
 BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bsha3d.pid}
 BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}}
-BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}}
-BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin}
+BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bsha3}}
+BITCOIND_GROUP=${BITCOIND_GROUP:-bsha3}
 BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bsha3d}
 BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}}
 BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}"

contrib/init/bsha3d.openrcconf

@@ -13,8 +13,8 @@
 #BITCOIND_DATADIR="/var/lib/bsha3d"
 
 # User and group to own bsha3d process
-#BITCOIND_USER="bitcoin"
-#BITCOIND_GROUP="bitcoin"
+#BITCOIND_USER="bsha3"
+#BITCOIND_GROUP="bsha3"
 
 # Path to bsha3d executable
 #BITCOIND_BIN="/usr/bin/bsha3d"

contrib/init/bsha3d.service

@@ -8,7 +8,7 @@
 # /etc/bsha3/bitcoin.conf
 
 [Unit]
-Description=Bitcoin daemon
+Description=BSHA3 daemon
 After=network.target
 
 [Service]

contrib/macdeploy/custom_dsstore.py

@@ -44,8 +44,8 @@
 alias.volume.name = package_name_ns
 alias.volume.posix_path = '/Volumes/' + package_name_ns
 alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg'
-alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bitcoinuser:\x00Documents:\x00bitcoin:\x00bitcoin:\x00' + package_name_ns + '.temp.dmg'
-alias.volume.disk_image_alias.target.posix_path = 'Users/bitcoinuser/Documents/bitcoin/bitcoin/' + package_name_ns + '.temp.dmg'
+alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bsha3user:\x00Documents:\x00bsha3:\x00bsha3:\x00' + package_name_ns + '.temp.dmg'
+alias.volume.disk_image_alias.target.posix_path = 'Users/bsha3user/Documents/bsha3/bsha3/' + package_name_ns + '.temp.dmg'
 alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff'
 icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
 ds['.']['icvp'] = icvp

contrib/valgrind.supp

@@ -1,4 +1,4 @@
-# Valgrind suppressions file for Bitcoin.
+# Valgrind suppressions file for BSHA3.
 #
 # Includes known Valgrind warnings in our dependencies that cannot be fixed
 # in-tree.

share/setup.nsi.in

@@ -51,9 +51,9 @@ Var StartMenuGroup
 # Installer attributes
 OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@WINDOWS_BITS@-setup.exe
 !if "@WINDOWS_BITS@" == "64"
-InstallDir $PROGRAMFILES64\Bitcoin
+InstallDir $PROGRAMFILES64\BSHA3
 !else
-InstallDir $PROGRAMFILES\Bitcoin
+InstallDir $PROGRAMFILES\BSHA3
 !endif
 CRCCheck on
 XPStyle on
@@ -138,7 +138,7 @@ Section -un.post UNSEC0001
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, @WINDOWS_BITS@-bit).lnk"
-    Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
+    Delete /REBOOTOK "$SMSTARTUP\BSHA3.lnk"
     Delete /REBOOTOK $INSTDIR\uninstall.exe
     Delete /REBOOTOK $INSTDIR\debug.log
     Delete /REBOOTOK $INSTDIR\db.log