use dmenu-based GUI instead

4 files changed, 30 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8219b7eba51f..25e8a6f72a04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = atool-desktop
 	pkgdesc = Desktop Entry for atool-based archive unpacking
-	pkgver = 0.1
-	pkgrel = 2
-	url = https://github.com/esclerofilo/tiny-utils
+	pkgver = 0.2
+	pkgrel = 1
+	url = https://github.com/~vicentereyes/PKGBUILDs
 	arch = any
 	depends = atool
+	depends = dmenu
 	source = atool-desktop.desktop
 	source = atool-desktop
-	md5sums = 8d461127207d59f6f271c3e2e24374e5
-	md5sums = 1b569d2c7b0ff4534c143bc9a97e4674
+	md5sums = 749254aae821b0c5278cd09ae64f8afd
+	md5sums = 019970d73f97d7225796fd6c4a0d705b
 
 pkgname = atool-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index ff71a02b2815..df1f49615931 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Vicente Reyes <vreyesvaldivieso [at] gmail [dot] com>
 pkgname=atool-desktop
-pkgver=0.1
-pkgrel=2
+pkgver=0.2
+pkgrel=1
 pkgdesc="Desktop Entry for atool-based archive unpacking"
 arch=('any')
-url="https://github.com/esclerofilo/tiny-utils"
+url="https://github.com/~vicentereyes/PKGBUILDs"
 license=()
-depends=('atool')
+depends=('atool'
+	 'dmenu')
 source=("$pkgname.desktop" "$pkgname")
-md5sums=('8d461127207d59f6f271c3e2e24374e5'
-         '1b569d2c7b0ff4534c143bc9a97e4674')
+md5sums=('749254aae821b0c5278cd09ae64f8afd'
+         '019970d73f97d7225796fd6c4a0d705b')
 
 package() {
   install  -Dm0755 atool-desktop "${pkgdir}/usr/bin/atool-desktop"
diff --git a/atool-desktop b/atool-desktop
index 09ae295256f5..616ea93be1a8 100755
--- a/atool-desktop
+++ b/atool-desktop
@@ -1,30 +1,26 @@
 #!/bin/sh -e
 
-askyn() (
+choose() {
+	awk ' 
+	BEGIN { print "."; print ".." } 
+	/[/@]$/ { print substr($0, 1, length-1) }
+	' | dmenu -i -p "$(pwd)/"
+}
+
+askdir() {
 	while :
 	do
-		printf '%s' "$@" ' '
-		read answer
-		case "$answer" in
-			y)
-				return 0
-				;;
-			n)
-				return 1
-				;;
-		esac
+		outdir=$(/bin/ls -F | choose)
+		if [ "$outdir" = "." ]; then
+			return 0
+		fi
+		cd "$outdir"
 	done
-)
-
-echo "Directory where extracted files will be stored:"
-pwd
+}
 
 for i in "$@"
 do
-	als "$i"
-	if askyn 'Do you want to extract this archive? [y/n]'
-	then
-		aunpack "$i"
-	fi
+	askdir $(pwd)
+	aunpack "$i"
 done
 
diff --git a/atool-desktop.desktop b/atool-desktop.desktop
index 0330805a6529..9d5334e253a1 100644
--- a/atool-desktop.desktop
+++ b/atool-desktop.desktop
@@ -3,7 +3,7 @@ Type=Application
 Name=atool-desktop
 Comment=Unpacks archives using atool
 Icon=utilities-terminal
-Terminal=true
+Terminal=false
 Exec=atool-desktop %U
 Categories=ConsoleOnly;System;FileTools;FileManager
 MimeType=application/epub+zip;application/gzip;application/vnd.android.package-archive;application/vnd.ms-cab-compressed;application/vnd.debian.binary-package;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-archive;application/x-arj;application/x-brotli;application/x-bzip-brotli-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-chrome-extension;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lz4;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lz4-compressed-tar;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-rzip-compressed-tar;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;