PKGBUILD update, deprecated octopi.install removed

3 files changed, 20 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8712e7666c2e..3d5418fabbc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = octopi-git
 	pkgdesc = This is Octopi, a powerful Pacman frontend using Qt libs
-	pkgver = 0.11.0.r24.c900d85
+	pkgver = 0.11.0.r25.d6a6ecc
 	pkgrel = 1
 	url = https://github.com/aarnt/octopi
-	install = octopi.install
 	arch = x86_64
 	license = GPL2
 	makedepends = git
diff --git a/PKGBUILD b/PKGBUILD
index b52a91892550..21baad920d1a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ WITH_KNOTIFICATION=0
 WITH_DARK_ICON=1
 
 pkgname=octopi-git
-pkgver=0.11.0.r24.c900d85
+pkgver=0.11.0.r25.d6a6ecc
 pkgrel=1
 pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs"
 arch=('x86_64')
@@ -49,7 +49,7 @@ conflicts=(
   'octopi-notifier-qt5'
   'octopi-notifier-noknotify'
 )
-install=octopi.install
+#install=octopi.install
 source=(
   'git+https://github.com/aarnt/octopi.git'
   'octopi_dark.png'
@@ -76,54 +76,30 @@ prepare() {
 
 build() {
   cd "${pkgname/-git/}" || exit
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi.pro
+  echo "Starting build..."
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.pro
   make
 
-  cd helper || exit
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-helper.pro
-  make
-  cd ..
-
-  cd notifier || exit
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-notifier.pro
-  make
-  cd ..
+  _subdirs="cachecleaner helper notifier repoeditor sudo"
 
-  cd repoeditor || exit
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-repoeditor.pro
-  make
-  cd ..
-
-  cd cachecleaner || exit
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-cachecleaner.pro
-  make
-  cd ..
-
-  cd sudo || exit
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-sudo.pro
-  make
+  for _subdir in $_subdirs; do
+    pushd $_subdir
+    echo "Building octopi-$_subdir..."
+    qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" "octopi-$_subdir.pro"
+    make
+    popd
+  done
 }
 
 package() {
   cd "${pkgname/-git/}" || exit
-  make INSTALL_ROOT="$pkgdir" install
-
-  cd helper || exit
-  make INSTALL_ROOT="$pkgdir" install
-  cd ..
-
-  cd notifier || exit
-  make INSTALL_ROOT="$pkgdir" install
-  cd ..
-
-  cd repoeditor || exit
-  make INSTALL_ROOT="$pkgdir" install
-  cd ..
+  make INSTALL_ROOT="${pkgdir}" install
 
-  cd cachecleaner || exit
-  make INSTALL_ROOT="$pkgdir" install
-  cd ..
+  _subdirs="cachecleaner helper notifier repoeditor sudo"
 
-  cd sudo || exit
-  make INSTALL_ROOT="$pkgdir" install
+  for _subdir in $_subdirs; do
+    pushd $_subdir
+    make INSTALL_ROOT="${pkgdir}" install
+    popd
+  done
 }
diff --git a/octopi.install b/octopi.install
deleted file mode 100644
index 955ac0af1287..000000000000
--- a/octopi.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-
-  systemctl enable octopi.service &> /dev/null
-}
-
-post_upgrade() {
-
-  post_install $1
-}
-
-post_remove() {
-
-  systemctl disable octopi.service &> /dev/null
-}