Depend on separate CLI package instead of building both

4 files changed, 20 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f38fcad38921..5a037cf3d258 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,24 @@
 pkgbase = chia-git
 	pkgdesc = A new blockchain and smart transaction platform that is easier to use, more efficient, and secure. - Latest git commit, provides GUI
-	pkgver = 1.7.0.b2.r15.g5f706cea27
+	pkgver = 1.3.5.r1165.gdd4d7d031
 	pkgrel = 1
+	epoch = 1
 	url = https://www.chia.net/
-	install = chia-git.install
 	arch = x86_64
 	arch = aarch64
 	license = Apache
+	makedepends = nodejs
 	makedepends = npm
 	makedepends = git
-	depends = python
-	depends = nodejs
+	depends = chia-cli-git
 	depends = electron
-	depends = openssl
 	provides = chia
-	provides = chia-cli
 	conflicts = chia
-	conflicts = chia-cli
 	options = !strip
-	source = git+https://github.com/Chia-Network/chia-blockchain.git
 	source = git+https://github.com/Chia-Network/chia-blockchain-gui.git
-	source = git+https://github.com/Chia-Network/mozilla-ca.git
-	source = chia.sh
 	source = chia-gui.sh
 	source = chia.desktop
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = ff9b9ee5d8a8b0d8b2d2129431663b3d4a199fe47d8996cfcdf06183c48b6349
 	sha256sums = dc42fea5581ee9ecc2b6e386b379ba3eaecabee0c92bab4b05bc5016cff3d1a4
 	sha256sums = f5374d9ed5f67567256c2df919559882a72db47709a42df820a44bad1bedd285
 
diff --git a/PKGBUILD b/PKGBUILD
index 1298cb8cdfd8..88c66a615c45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,76 +1,46 @@
 # Maintainer: Ben Westover <me@benthetechguy.net>
 
 pkgname='chia-git'
-pkgver=1.7.0.b2.r15.g5f706cea27
+pkgver=1.3.5.r1165.gdd4d7d031
 pkgrel=1
+epoch=1
 pkgdesc="A new blockchain and smart transaction platform that is easier to use, more efficient, and secure. - Latest git commit, provides GUI"
 arch=('x86_64' 'aarch64')
 url="https://www.chia.net/"
 license=('Apache')
-install=chia-git.install
-depends=('python' 'nodejs' 'electron' 'openssl')
-makedepends=('npm' 'git')
-conflicts=('chia' 'chia-cli')
-provides=('chia' 'chia-cli')
+depends=('chia-cli-git' 'electron')
+makedepends=('nodejs' 'npm' 'git')
+conflicts=('chia')
+provides=('chia')
 options=('!strip')
-source=("git+https://github.com/Chia-Network/chia-blockchain.git"
-        "git+https://github.com/Chia-Network/chia-blockchain-gui.git"
-        "git+https://github.com/Chia-Network/mozilla-ca.git"
-        "chia.sh"
+source=("git+https://github.com/Chia-Network/chia-blockchain-gui.git"
         "chia-gui.sh"
         "chia.desktop")
 sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'ff9b9ee5d8a8b0d8b2d2129431663b3d4a199fe47d8996cfcdf06183c48b6349'
             'dc42fea5581ee9ecc2b6e386b379ba3eaecabee0c92bab4b05bc5016cff3d1a4'
             'f5374d9ed5f67567256c2df919559882a72db47709a42df820a44bad1bedd285')
 
 pkgver() {
-	cd chia-blockchain
+	cd chia-blockchain-gui
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-	cd chia-blockchain
-	git submodule init
-	git config submodule.mozilla-ca.url "$srcdir/mozilla-ca"
-	git config submodule.chia-blockchain-gui.url "$srcdir/chia-blockchain-gui"
-	git -c protocol.file.allow=always submodule update
-}
-
 build() {
-	cd chia-blockchain 
-	python -m venv venv
-	ln -s venv/bin/activate
-	source activate
-	pip install --upgrade pip
-	pip install wheel
-	pip install --extra-index-url https://pypi.chia.net/simple/ miniupnpc==2.2.2
-	pip install -e . --extra-index-url https://pypi.chia.net/simple/
-
 	cd chia-blockchain-gui
+	source /opt/chia-blockchain/venv/bin/activate
 	npm install
 	npm run build
 }
 
 package() {
-	mkdir -p "$pkgdir/opt"
-	mv chia-blockchain/chia-blockchain-gui/packages/gui chia-blockchain
-	rm -rf chia-blockchain/chia-blockchain-gui
-	rm -rf chia-blockchain/gui/node_modules
-	mv chia-blockchain "$pkgdir/opt"
-
-	install -Dm755 chia.sh "$pkgdir/usr/bin/chia"
-	install -Dm755 chia-gui.sh "$pkgdir/usr/bin/chia-gui"
-	install -Dm644 chia.desktop "$pkgdir/usr/share/applications/chia.desktop"
-	mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps"
-	ln -s /opt/chia-blockchain/gui/src/assets/img/chia_circle.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/chia.svg"
+	mkdir -p "$pkgdir/opt/chia-blockchain/gui"
+	mv chia-blockchain-gui/packages/gui/build "$pkgdir/opt/chia-blockchain/gui"
+	mv chia-blockchain-gui/packages/gui/package.json "$pkgdir/opt/chia-blockchain/gui"
 
 	# remove "../../../" based on buildtime directory layout
 	find "$pkgdir/opt/chia-blockchain/gui" -type f -exec sed -i "s|\.\./\.\./\.\./||g" {} \;
-	# replace references to srcdir with final install location
-	find "$pkgdir/opt/chia-blockchain" -type f -exec sed -i "s|${srcdir}|/opt|g" {} \;
-	# remove compiled python modules because they contain references to srcdir
-	find "$pkgdir/opt/chia-blockchain" -name '*.pyc' -delete
+
+	install -Dm755 chia-gui.sh "$pkgdir/usr/bin/chia-gui"
+	install -Dm644 chia.desktop "$pkgdir/usr/share/applications/chia.desktop"
+	install -Dm644 chia-blockchain-gui/packages/gui/src/assets/img/chia_circle.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/chia.svg"
 }
diff --git a/chia-git.install b/chia-git.install
deleted file mode 100644
index 170baa373a55..000000000000
--- a/chia-git.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-	echo -e "\033[1;32m==>\033[0m \033[1mThe chia source code is installed in /opt/chia-blockchain."
-}
diff --git a/chia.sh b/chia.sh
deleted file mode 100755
index 020e195e85b6..000000000000
--- a/chia.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd /opt/chia-blockchain
-source venv/bin/activate
-chia "$@"