updated net block and porter, added innernet for post-login networking

setup; added compositor toggle

1 files changed, 3 insertions, 21 deletions

diff --git a/abraham-porter.sh b/abraham-porter.sh
index 02a6b90..23be09a 100755
--- a/abraham-porter.sh
+++ b/abraham-porter.sh
@@ -16,8 +16,7 @@ OK=0
 NO_ACTION_PROVIDED=3
 NO_PORT_PROVIDED=4
 NO_PKG_DESCR_FOUND=5
-NO_WANT_TERM_PROVIDED=6
-NO_WANT_ANOTHER_PROVIDED=7
+NO_WANT_ANOTHER_PROVIDED=6
 
 
 ## Gets a port name from the user with dmenu
@@ -29,15 +28,6 @@ get_port() {
 }
 
 
-## Prompt user if they want to run command in a new term
-wants_term() {
-	choice=$(printf "no\nyes\n" | dmenu -p "Do you want to do this in a new terminal?")
-	[ $choice = "no" ] && return 1
-	[ $choice = "yes" ] && return 0
-	exit $NO_WANT_TERM_PROVIDED
-}
-
-
 ## Gets an action from the user with dmenu
 get_action() {
 	action=$(dmenu -p "Abraham Porter" << EOF
@@ -89,11 +79,7 @@ handle_poudriere_options_single() {
 handle_poudriere_bulk_single() {
 	port="$1"
 	notify-send "Poudriere bulk started" "$port"
-	if wants_term; then
-		$terminal -e $doas poudriere bulk -j "$jail" $port
-	else
-		$doas poudriere bulk -j "$jail" $port
-	fi
+	$terminal -e $doas poudriere bulk -j "$jail" $port
 	notify-send "Poudriere bulk finished" "$port"
 }
 
@@ -107,11 +93,7 @@ handle_poudriere_options_pkglist() {
 ## Handle running poudriere bulk on pkglist
 handle_poudriere_bulk_pkglist() {
 	notify-send "Poudriere bulk started" "(pkglist)"
-	if wants_term; then
-		$terminal -e $doas poudriere bulk -j "$jail" -f "$pkglist"
-	else
-		$doas poudriere bulk -j "$jail" -f "$pkglist"
-	fi
+	$terminal -e $doas poudriere bulk -j "$jail" -f "$pkglist"
 	notify-send "Poudriere bulk finished" "(pkglist)"
 }