Remove post_install file handling

And re-implement it in `package`

You may need to force-install some files or uninstall and then reinstall
because file handling wasn't great (it was sitty as hell) in previous
versions

3 files changed, 49 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75a08dc90551..eedaf511a35e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,17 @@
 pkgbase = cesium-desktop-deb
 	pkgdesc = Cesium Wallet for Ğ1 currency. Cesium is a wallet (client-software) for Ğ1, a libre currency.
 	pkgver = 1.6.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.cesium.app
-	install = cesium-desktop-deb.install
-	arch = any
+	arch = x86_64
 	groups = 
 	license = AGPL3
+	makedepends = unzip
+	makedepends = sed
+	depends = nodejs
+	depends = gtk3
+	depends = nss
+	depends = libxss
 	provides = cesium-desktop
 	options = !strip
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index c1aa521637bb..b00f537ce0c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,16 @@
-# Generated by debtap
 # Maintainer: Amael <nils.van-zuijlen@mailo.com> & llaq <contact@lelibreauquotidien.fr>
 pkgname=cesium-desktop-deb
 pkgver=1.6.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Cesium Wallet for Ğ1 currency. Cesium is a wallet (client-software) for Ğ1, a libre currency."
-arch=('any')
+arch=('x86_64')
 url="https://www.cesium.app"
 license=('AGPL3')
 groups=('')
-depends=()
+makedepends=("unzip" "sed")
+depends=("nodejs" "gtk3" "nss" "libxss")
 provides=("cesium-desktop")
 options=('!strip' '!emptydirs')
-install=${pkgname}.install
 source=("https://github.com/duniter/cesium/releases/download/v${pkgver}/cesium-desktop-v${pkgver}-linux-x64.deb")
 sha512sums=('e95e391c5af6999bacd0666cfb870101bcd464fc587f3331e64914f13424f8930046284c63cae5e5158b74533bbef3d1dc32c654edd82f0638da68112af65bed')
 
@@ -20,4 +19,41 @@ package(){
 	# Extract package data
 	tar xf data.tar.xz -C "${pkgdir}"
 
+	mkdir $pkgdir/usr/bin
+
+	# Do here what was done post_install by the debian package
+	CESIUM_ROOT="${pkgdir}/opt/cesium"
+        CESIUM_G1_TEST="${pkgdir}/opt/cesium-g1-test"
+        CESIUM_NW=$CESIUM_ROOT/nw
+
+        unzip -q -d $CESIUM_NW $CESIUM_ROOT/nw.nwb
+	rm $CESIUM_ROOT/nw.nwb
+        chmod +x $CESIUM_NW/nw $CESIUM_NW/lib $CESIUM_NW/locales
+
+	cd $pkgdir/usr/bin
+        ln -s ../../opt/cesium/nw/nw cesium
+
+        chmod +r -R $CESIUM_ROOT
+
+        # Create a Cesium for G1-Test
+        cd $pkgdir/opt
+        cp -r "$CESIUM_ROOT" "$CESIUM_G1_TEST"
+        cd "$CESIUM_G1_TEST/nw/"
+        sed -i 's/"cesium"/"cesium-g1-test"/g' package.json
+
+        # Change title of Cesium test
+        sed -i 's/Cesium/Cesium Ğ1-Test/g' splash.html
+        sed -i 's/Cesium/Cesium Ğ1-Test/g' cesium/index.html
+        sed -i 's/g1.duniter/g1-test.duniter/g' cesium/config.js
+        sed -i 's/g1.data/g1-test.data/g' cesium/config.js
+        sed -i 's/"g1"/"g1-test"/g' cesium-desktop.js
+        sed -i 's/.config\/cesium\//.config\/cesium-g1-test\//g' cesium-desktop.js
+
+	cd $pkgdir/usr/bin
+        ln -s ../../opt/cesium-g1-test/nw/nw cesium-g1-test
+
+        # Change title of Cesium classic
+        cd "$CESIUM_ROOT/nw/"
+        sed -i 's/Cesium/Cesium Ğ1/g' splash.html
+        sed -i 's/Cesium/Cesium Ğ1/g' cesium/index.html
 }
diff --git a/cesium-desktop-deb.install b/cesium-desktop-deb.install
deleted file mode 100644
index 54f9ae623a88..000000000000
--- a/cesium-desktop-deb.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-	CESIUM_ROOT=/opt/cesium
-	CESIUM_G1_TEST=/opt/cesium-g1-test
-	CESIUM_NW=$CESIUM_ROOT/nw
-
-	if [[ -f $CESIUM_ROOT/nw.nwb ]]; then
-	  unzip -q -d $CESIUM_NW $CESIUM_ROOT/nw.nwb
-	  chmod +x $CESIUM_NW/nw $CESIUM_NW/lib $CESIUM_NW/locales
-	  ln -s $CESIUM_NW/nw /usr/bin/cesium
-	fi
-
-	chmod +r -R $CESIUM_ROOT
-
-	# Create a Cesium for G1-Test
-	cd /opt
-	cp -r "$CESIUM_ROOT" "$CESIUM_G1_TEST"
-	cd "$CESIUM_G1_TEST/nw/"
-	sed -i 's/"cesium"/"cesium-g1-test"/g' package.json
-	ln -s "$CESIUM_G1_TEST/nw/nw" /usr/bin/cesium-g1-test
-
-	# Change title of Cesium test
-	sed -i 's/Cesium/Cesium Ğ1-Test/g' cesium/index.html
-	sed -i 's/Cesium/Cesium Ğ1-Test/g' cesium/debug.html
-	sed -i 's/g1.duniter/g1-test.duniter/g' cesium/config.js
-	sed -i 's/g1.data/g1-test.data/g' cesium/config.js
-	sed -i 's/"g1"/"g1-test"/g' cesium/node.js
-	sed -i 's/.config\/cesium\//.config\/cesium-g1-test\//g' cesium/node.js
-
-	# Change title of Cesium classic
-	cd "$CESIUM_ROOT/nw/"
-	sed -i 's/Cesium/Cesium Ğ1/g' cesium/index.html
-	sed -i 's/Cesium/Cesium Ğ1/g' cesium/debug.html
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-
-	[[ -f /usr/bin/cesium ]] && rm /usr/bin/cesium
-	[[ -f /usr/bin/cesium-g1-test ]] && rm /usr/bin/cesium-g1-test
-	[[ -f /usr/bin/cesium-desktop ]] && rm -f /usr/bin/cesium-desktop
-	[[ -d /opt/cesium ]] && rm -Rf /opt/cesium
-	[[ -d /opt/cesium-g1-test ]] && rm -Rf /opt/cesium-g1-test
-}