Upgrading version 1.7

2 files changed, 30 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bed83a0d84b..175b5f7b331b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = buttermanager
 	pkgdesc = Graphical tool to create BTRFS snapshots, balance filesystems and upgrade the system safetly
-	pkgver = 1.6.1
+	pkgver = 1.7
 	pkgrel = 6
 	url = https://github.com/egara/buttermanager
 	arch = i686
@@ -8,12 +8,9 @@ pkgbase = buttermanager
 	license = GPL
 	makedepends = python>=3
 	makedepends = git
-	makedepends = python-setuptools
 	depends = python>=3
 	depends = btrfs-progs
-	depends = python-pyaml
 	source = git+https://github.com/egara/buttermanager.git#branch=master
 	md5sums = SKIP
 
 pkgname = buttermanager
-
diff --git a/PKGBUILD b/PKGBUILD
index 3db12dffeff5..3d3c2de16047 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Eloy Garcia Almaden <eloy.garcia.pca@gmail.com>
 pkgname=buttermanager
-pkgver=1.6.1
+pkgver=1.7
 pkgrel=6
 epoch=
 pkgdesc="Graphical tool to create BTRFS snapshots, balance filesystems and upgrade the system safetly"
@@ -8,8 +8,8 @@ arch=('x86_64')
 url="https://github.com/egara/buttermanager"
 license=('GPL')
 groups=()
-depends=('btrfs-progs' 'python>=3' 'python-pyaml')
-makedepends=('git' 'python-setuptools')
+depends=('btrfs-progs' 'python>=3')
+makedepends=('python>=3' 'git')
 checkdepends=()
 optdepends=()
 provides=()
@@ -24,21 +24,34 @@ noextract=()
 md5sums=('SKIP')
 validpgpkeys=()
 
-build() {
-	cd "$pkgname"
-        # Dependencies and package installation
-	python setup.py install --user
-}
-
 package() {
-	cd "$pkgname"
+        cd "$pkgname"
         # Creating destination directory
-  	install -dm755 "$pkgdir/opt/$pkgname"
+        install -dm755 "$pkgdir/opt/$pkgname"
+
+        # Copying all the structure to the destination directory
+        cp -ar "$srcdir/$pkgname/$pkgname/" "$pkgdir/opt/$pkgname/"
+
+        # Copying requirements
+        echo -e "\n Copying resources..."
+        cp -ar "requirements.txt" "$pkgdir/opt/$pkgname/"
+  
+        # Creating virtual environment
+        echo -e "\n Creating virtual environment..."
+        cd "$pkgdir/opt/$pkgname/"
+        python -m venv env
+
+        # Enabling virtual environment
+        echo -e "\n Enabling virtual environment..."
+        source env/bin/activate
 
-	# Copying all the structure to the destination directory
-	cp -ar "$srcdir/$pkgname/$pkgname/" "$pkgdir/opt/$pkgname/"
+        # Installing requirements
+        echo -e "\n Installing all the required modules into the virtual environment. Please wait..."
+        pip install --upgrade pip
+        pip install -r requirements.txt         
 
-  	# Copying .desktop file and icon
-  	install -Dm644 "$srcdir/$pkgname/aur/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-	install -Dm644 "$srcdir/$pkgname/aur/$pkgname.svg" "$pkgdir/opt/$pkgname/gui/$pkgname.svg"
+        # Copying .desktop file and icon
+        echo -e \n "Creating desktop icon. Finishing the installation"
+        install -Dm644 "$srcdir/$pkgname/aur/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+        install -Dm644 "$srcdir/$pkgname/aur/$pkgname.svg" "$pkgdir/opt/$pkgname/gui/$pkgname.svg"
 }