apply rebranding renames from #1039

Don't rename the package yet, so that users get an update
with a message. Package renaming will happen soon.

7 files changed, 65 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa3dfa3f66d8..f83bf76cf1ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Sep  3 17:26:37 UTC 2016
+# Sat Sep  3 18:55:19 UTC 2016
 pkgbase = bitmonero-git
 	pkgdesc = Peer-to-peer network based anonymous digital currency (includes deaemon, wallet and miner)
 	pkgver = 0.9.4
-	pkgrel = 5
+	pkgrel = 6
 	url = https://getmonero.org/
 	arch = x86_64
 	arch = i686
@@ -17,20 +17,20 @@ pkgbase = bitmonero-git
 	depends = miniupnpc>=1.6
 	depends = libunwind
 	depends = openssl
-	source = bitmonero::git+https://github.com/monero-project/monero.git
-	source = bitmonerod.service
-	source = bitmonerod.conf
-	source = bitmonero.install
+	source = monero::git+https://github.com/monero-project/monero.git
+	source = monerod.service
+	source = monerod.conf
+	source = monero.install
 	md5sums = SKIP
-	md5sums = 9e8e52d5379c534e9cde86e5d6c39592
-	md5sums = eb04582e2007f8e450322c1794ed30ba
-	md5sums = 513a3ff4be5cb6f3faf13ffcb680b941
+	md5sums = 978b5dda921ad298d93eaf701094f835
+	md5sums = 7115d61857ce249a3e9ccf2c6bc4f00b
+	md5sums = 22c9f8201e5c97c9e1595de26f401d92
 
 pkgname = bitmonero-git
-	install = bitmonero.install
+	install = monero.install
 	provides = bitmonero
 	conflicts = bitmonero
-	backup = etc/bitmonerod.conf
+	backup = etc/monerod.conf
 
 pkgname = libmonero-wallet-git
 	provides = libmonero-wallet
diff --git a/PKGBUILD b/PKGBUILD
index 7ba891843236..da84355bc8b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Onishin <onishin at onishin dot org>
 # Co-maintainer: redfish <redfish at galactica dot pw>
 
+# TODO: rename package to monero-git in a few weeks
 pkgbase=('bitmonero-git')
 pkgname=('bitmonero-git' 'libmonero-wallet-git')
-_gitname='bitmonero'
+_gitname='monero'
 pkgver=0.9.4
-pkgrel=5
+pkgrel=6
 arch=('x86_64' 'i686' 'armv7h')
 url="https://getmonero.org/"
 license=('custom:Cryptonote')
@@ -16,15 +17,15 @@ makedepends=('git' 'cmake' 'boost')
 
 pkgdesc="Peer-to-peer network based anonymous digital currency (includes deaemon, wallet and miner)"
 source=("$_gitname::git+https://github.com/monero-project/monero.git"
-        "bitmonerod.service"
-        "bitmonerod.conf"
-        "bitmonero.install"  
+        "monerod.service"
+        "monerod.conf"
+        "monero.install"
 )
 	
 md5sums=('SKIP'
-         '9e8e52d5379c534e9cde86e5d6c39592' 
-         'eb04582e2007f8e450322c1794ed30ba' 
-         '513a3ff4be5cb6f3faf13ffcb680b941')
+         '978b5dda921ad298d93eaf701094f835'
+         '7115d61857ce249a3e9ccf2c6bc4f00b'
+         '22c9f8201e5c97c9e1595de26f401d92')
 
 _builddir=build
 
@@ -73,22 +74,19 @@ package_bitmonero-git() {
 	provides=('bitmonero')
 	conflicts=('bitmonero')
 
-	backup=('etc/bitmonerod.conf')
-	install=bitmonero.install
+	backup=('etc/monerod.conf')
+	install=monero.install
 
         # Uncomment for a debug build
         # options=(!strip debug)
 
-	install -D -m755 "$srcdir/$_gitname/build/bin/bitmonerod" "$pkgdir/usr/bin/bitmonerod"
-	install -D -m755 "$srcdir/$_gitname/build/bin/simplewallet" "$pkgdir/usr/bin/simplewallet"
-	install -D -m755 "$srcdir/$_gitname/build/bin/simpleminer" "$pkgdir/usr/bin/simpleminer"
-	install -D -m755 "$srcdir/$_gitname/build/bin/blockchain_import" "$pkgdir/usr/bin/bitmonero-import"
-	install -D -m755 "$srcdir/$_gitname/build/bin/blockchain_export" "$pkgdir/usr/bin/bitmonero-export"
-	install -D -m755 "$srcdir/$_gitname/build/bin/blockchain_dump" "$pkgdir/usr/bin/bitmonero-dump"
-	install -D -m755 "$srcdir/$_gitname/build/bin/cn_deserialize" "$pkgdir/usr/bin/bitmonero-deserialize"
+	install -D -m755 "$srcdir/$_gitname/build/bin/monerod" "$pkgdir/usr/bin/monerod"
+	install -D -m755 "$srcdir/$_gitname/build/bin/monero-wallet-cli" "$pkgdir/usr/bin/monero-wallet-cli"
+	install -D -m755 "$srcdir/$_gitname/build/bin/monero-blockchain-import" "$pkgdir/usr/bin/monero-blockchain-import"
+	install -D -m755 "$srcdir/$_gitname/build/bin/monero-blockchain-export" "$pkgdir/usr/bin/monero-blockchain-export"
 
-	install -Dm644 $srcdir/bitmonerod.service "${pkgdir}/usr/lib/systemd/system/bitmonerod.service"
-	install -Dm644 "$srcdir/bitmonerod.conf" "$pkgdir/etc/bitmonerod.conf"
+	install -Dm644 $srcdir/monerod.service "${pkgdir}/usr/lib/systemd/system/monerod.service"
+	install -Dm644 "$srcdir/monerod.conf" "$pkgdir/etc/monerod.conf"
 	install -D -m644 "$srcdir/$_gitname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/bitmonero.install b/bitmonero.install
deleted file mode 100644
index 4951b3ed2af1..000000000000
--- a/bitmonero.install
+++ /dev/null
@@ -1,28 +0,0 @@
-post_install() {
-    getent passwd bitmonero &>/dev/null || {
-        echo -n ">>> Creating bitmonero user... "
-        useradd --system --user-group -m --home /var/lib/bitmonero bitmonero
-        echo "done"
-    } # NOTE: we do not autoremove user due to security concerns (Arch policy)
-
-    mkdir -p /var/log/bitmonero && chown bitmonero:bitmonero /var/log/bitmonero
-}
-
-post_upgrade() {
-
-    #Need for upgrade for user old version not execute post_install
-    getent passwd bitmonero &>/dev/null || {
-        echo -n ">>> Creating bitmonero user... "
-        useradd --system --user-group -m --home /var/lib/bitmonero bitmonero
-        echo "done"
-    } # NOTE: we do not autoremove user due to security concerns (Arch policy)
-
-    mkdir -p /var/log/bitmonero && chown bitmonero:bitmonero /var/log/bitmonero
-
-
-    echo ">>> NOTICE: Package changed location of bitmonero data dir."
-    echo ">>> Please move your bitmonero data dir to new location "
-    echo ">>> before starting daemon systemd service:"
-    echo ">>>     sudo mv ~USER/.bitmonero/* /var/lib/bitmonero/"
-    echo ">>>     sudo chown -R bitmonero:bitmonero  /var/lib/bitmonero/"
-}
diff --git a/bitmonerod.conf b/bitmonerod.conf
deleted file mode 100644
index 64a02741d7bd..000000000000
--- a/bitmonerod.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for bitmonerod
-# Syntax: any command line option may be specified as 'clioptionname=value'.
-# See 'bitmonerod --help' for all available options.
-
-data-dir=/var/lib/bitmonero
-log-file=/var/log/bitmonero/bitmonero.log
-log-level=0
diff --git a/monero.install b/monero.install
new file mode 100644
index 000000000000..c63e0f049508
--- /dev/null
+++ b/monero.install
@@ -0,0 +1,26 @@
+create_user() {
+    getent passwd monero &>/dev/null || {
+        echo -n ">>> Creating monero user... "
+        useradd --system --user-group -m --home /var/lib/monero monero
+        echo "done"
+    } # NOTE: we do not autoremove user due to security concerns (Arch policy)
+
+    mkdir -p /var/log/monero && chown monero:monero /var/log/monero
+}
+
+post_install() {
+    create_user
+}
+
+post_upgrade() {
+    create_user
+
+    echo ">>> NOTICE: Package changed location of data dir (again! rebranding)."
+    echo ">>> Please move your monero data dir to new location "
+    echo ">>> before starting daemon systemd service:"
+    echo ">>>     sudo mv /var/lib/bitmonero /var/lib/monero/"
+    echo ">>>     sudo chown -R monero:monero  /var/lib/monero/"
+
+    echo ">>> NOTICE: Soon, this package will be renamed to 'monero-git':"
+    echo ">>> this package will be deprecated and a new package will be created."
+}
diff --git a/monerod.conf b/monerod.conf
new file mode 100644
index 000000000000..9b391dfa1c10
--- /dev/null
+++ b/monerod.conf
@@ -0,0 +1,7 @@
+# Configuration for monerod
+# Syntax: any command line option may be specified as 'clioptionname=value'.
+# See 'monerod --help' for all available options.
+
+data-dir=/var/lib/monero
+log-file=/var/log/monero/monero.log
+log-level=0
diff --git a/bitmonerod.service b/monerod.service
index da012c4e38a9..9948b729bc6c 100644
--- a/bitmonerod.service
+++ b/monerod.service
@@ -3,14 +3,14 @@ Description=Monero cryptocurrency node
 After=network.target
 
 [Service]
-User=bitmonero
-Group=bitmonero
+User=monero
+Group=monero
 WorkingDirectory=~
 
 Type=forking
-ExecStart=/usr/bin/bitmonerod --config-file /etc/bitmonerod.conf --detach
+ExecStart=/usr/bin/monerod --config-file /etc/monerod.conf --detach
 
-# This is necessary because bitmonerod does not yet support
+# This is necessary because monerod does not yet support
 # writing a PID file, which means systemd tries to guess the PID
 # by default, but it guesses wrong (sometimes, depending on
 # random timing of events), because the daemon forks twice.