summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Westover2021-07-18 17:13:57 -0400
committerBen Westover2021-07-18 17:13:57 -0400
commit178271e14faacdf5faa005e405161c00797056b7 (patch)
tree185048648de81e1062fc54f7a15a4f276a8bef4c
parentcf67fef73269032999e777a9f1aec973a9538b69 (diff)
downloadaur-178271e14faacdf5faa005e405161c00797056b7.tar.gz
Revert back to venv combined with source code
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
-rw-r--r--chia-git.install2
3 files changed, 15 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47fe1a260d1a..29379b805e5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = chia-git
pkgdesc = A new blockchain and smart transaction platform that is easier to use, more efficient, and secure.
- pkgver = 1.2.1.r20.gf708500f
- pkgrel = 2
+ pkgver = 1.2.1.r0.gefd401ee
+ pkgrel = 3
url = https://www.chia.net/
install = chia-git.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index fe49386b94b3..11c787f1ff65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Ben Westover <kwestover.kw@gmail.com>
pkgname='chia-git'
-pkgver=1.2.1.r20.gf708500f
-pkgrel=2
+pkgver=1.2.1.r0.gefd401ee
+pkgrel=3
pkgdesc="A new blockchain and smart transaction platform that is easier to use, more efficient, and secure."
arch=('x86_64' 'aarch64')
url="https://www.chia.net/"
@@ -28,16 +28,20 @@ prepare() {
git submodule update --init mozilla-ca
}
-package() {
- mkdir -p "$pkgdir/opt/chia-blockchain"
- python -m venv "$pkgdir/opt/chia-blockchain"
- ln -s "$pkgdir/opt/chia-blockchain/bin/activate" "$pkgdir/opt/chia-blockchain/activate"
- source "$pkgdir/opt/chia-blockchain/bin/activate"
- cd chia-blockchain
+build() {
+ cd chia-blockchain
+ python3 -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/
+}
+
+package() {
+ mkdir -p "$pkgdir/opt"
+ mv chia-blockchain "$pkgdir/opt"
find "$pkgdir/opt/chia-blockchain" -type f -exec sed -i "s|${srcdir}|/opt|g" {} \; # replace references to srcdir with final install location
find "$pkgdir/opt/chia-blockchain" -name '*.pyc' -delete # remove compiled python modules because they contain references to srcdir
}
diff --git a/chia-git.install b/chia-git.install
index acbc599beccb..170baa373a55 100644
--- a/chia-git.install
+++ b/chia-git.install
@@ -1,3 +1,3 @@
post_install() {
- echo -e "\033[1;32m==>\033[0m \033[1mThe chia virtual environment is installed in /opt/chia-blockchain."
+ echo -e "\033[1;32m==>\033[0m \033[1mThe chia source code is installed in /opt/chia-blockchain."
}