2.1 release

2 files changed, 28 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a592469c8ee8..b618b79f8f32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = maint
 	pkgdesc = A utility to automatically perform Arch Linux system maintenance
-	pkgver = 1.19
+	pkgver = 2.1
 	pkgrel = 1
 	url = https://gitlab.com/mgdobachesky/ArchSystemMaintenance
 	arch = x86_64
@@ -17,9 +17,11 @@ pkgbase = maint
 	depends = sed
 	depends = sudo
 	depends = vim
+	depends = dialog
+	optdepends = nano
 	backup = opt/maint/settings.sh
-	source = https://gitlab.com/mgdobachesky/ArchSystemMaintenance/raw/master/pkg/maint-1.19.tar.xz
-	md5sums = 449b61222c87a9063f9383841d2f0b25
+	source = https://gitlab.com/mgdobachesky/ArchSystemMaintenance/raw/master/pkg/maint-2.1.tar.xz
+	md5sums = 650782ca07dd9c39627a65cf1325fd2d
 
 pkgname = maint
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b05d0e6e6fb..4689c2ebfe8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _install_dir="opt/$_pkg_name"
 _symlink_dir="usr/bin"
 
 pkgname="$_pkg_name"
-pkgver=1.19
+pkgver=2.1
 pkgrel=1
 pkgdesc="A utility to automatically perform Arch Linux system maintenance"
 arch=('x86_64')
@@ -23,30 +23,39 @@ depends=(
     'rsync'
     'sed'
     'sudo'
-    'vim')
+    'vim'
+    'dialog'
+)
+optdepends=(
+    'nano'
+)
 backup=("$_install_dir/settings.sh")
 
 source=("https://gitlab.com/mgdobachesky/ArchSystemMaintenance/raw/master/pkg/$pkgname-$pkgver.tar.xz")
 
-md5sums=('449b61222c87a9063f9383841d2f0b25')
+md5sums=('650782ca07dd9c39627a65cf1325fd2d')
 
-build() {
+prepare() {
     umask 022
-    mkdir -p "$_install_dir"
+    mkdir -p "$_install_dir/ui" "$_install_dir/other"
     mkdir -p "$_symlink_dir"
+}
 
-    sed -i "s|{{PKG_PATH}}|/${_install_dir}|" "run.sh"
-
-    install -m 755 "run.sh" "$_install_dir"
-    install -m 755 "archNews.py" "$_install_dir"
-    install -m 755 "settings.sh" "$_install_dir"
+build() {
+    install -m 755 "$srcdir/$pkgname/other/archNews.py" "$_install_dir/other"
+    install -m 755 "$srcdir/$pkgname/ui/cli.sh" "$_install_dir/ui"
+    install -m 755 "$srcdir/$pkgname/ui/nCurses.sh" "$_install_dir/ui"
+    install -m 755 "$srcdir/$pkgname/logic.sh" "$_install_dir"
+    install -m 755 "$srcdir/$pkgname/menu.sh" "$_install_dir"
+    install -m 755 "$srcdir/$pkgname/run.sh" "$_install_dir"
+    install -m 755 "$srcdir/$pkgname/settings.sh" "$_install_dir"
 }
 
 package() {
-    install_base=$(echo "$_install_dir" | cut -d '/' -f 1)
-    symlink_base=$(echo "$_symlink_dir" | cut -d '/' -f 1)
+    _install_base=$(echo "$_install_dir" | cut -d '/' -f 1)
+    _symlink_base=$(echo "$_symlink_dir" | cut -d '/' -f 1)
 
-    cp -r "$install_base" "$pkgdir"
-    cp -r "$symlink_base" "$pkgdir"
+    cp -r "$_install_base" "$pkgdir"
+    cp -r "$_symlink_base" "$pkgdir"
     ln -s "/$_install_dir/run.sh" "$pkgdir/$_symlink_dir/$pkgname"
 }