X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=gopher.sh;h=58175702600c07be27fe6f97fddb896273c14163;hb=fcda6ae3df75d214b74022323d421283764f27ff;hp=0ec852b0cf9f1dbe15def858d60f295ac1f756a7;hpb=61fcec09f7f5d1361d763a35bcd3f966ed0aef88;p=gofetch.git

diff --git a/gopher.sh b/gopher.sh
index 0ec852b..5817570 100755
--- a/gopher.sh
+++ b/gopher.sh
@@ -10,6 +10,10 @@
 #		...
 #		download: fake mode to download the result without changes
 
+# Manual:
+# 	When asked for a number (non-dialog uses only), you can also
+#	enter 'n' or 'p' to get the next or previous item (+1 or -1)
+
 # ENV variables:
 # 	USE_DIALOG: force the usage of the command 'dialog'
 #		  : true if dialog is found
@@ -24,6 +28,13 @@
 # 		0 : do not invert (default)
 #		1 : invert 
 
+# EXIT Codes:
+#	  0: ok
+#	  1: syntax error
+#	  2: cannot contact server
+#	  3: unknown selector mode
+#	255: special exit more 'q'
+
 SERVER="$1"
 SELECTOR="$2"
 PORT="$3"
@@ -47,7 +58,7 @@ fi
 
 if [ "$SERVER" = "" ]; then
 	echo "Syntax error: $0 [SERVER] ([SELECTOR]) ([PORT]) ([MODE])" >&2
-	exit 2
+	exit 1
 fi
 
 # can be "-" for no escape sequences
@@ -132,10 +143,14 @@ finish() {
 }
 trap finish EXIT
 
+echo "$SELECTOR" | nc "$SERVER" "$PORT" > "$tmp"
+if [ $? != 0 ]; then
+	echo Cannot contact gopher server "[$SERVER]" >&2
+	exit 2
+fi
+
 if [ $MODE = 1 ]; then
-	echo "$SELECTOR" | nc "$SERVER" "$PORT" | sed 's:\r::g' > "$tmp"
-else
-	echo "$SELECTOR" | nc "$SERVER" "$PORT" > "$tmp"
+	sed --in-place 's:\r::g' "$tmp"
 fi
 
 # Process page content
@@ -148,7 +163,7 @@ download)
 	cat "$tmp" | less
 ;;
 1|+)
-	CHOICE=start
+	CHOICE=0
 	while [ "$CHOICE" != "" ]; do
 		if [ "$USE_DIALOG" = 1 ]; then
 			> "$tmp.menu"
@@ -179,7 +194,17 @@ download)
 			rm "$tmp.choice"
 		else
 			cat_menu "$tmp" | less
-			read -p "[$SELECTOR]: " CHOICE
+			read -p "[$SELECTOR]: " NEW_CHOICE
+			if [ "$NEW_CHOICE" = p ]; then
+				CHOICE=`expr "$CHOICE" - 1 2>/dev/null`
+				if [ "$CHOICE" -lt 0 ]; then
+					CHOICE=`cat "$tmp" | grep "^$PREFIX" | wc --lines`
+				fi
+			elif [ "$NEW_CHOICE" = n ]; then
+				CHOICE=`expr "$CHOICE" + 1 2>/dev/null`
+			else
+				CHOICE="$NEW_CHOICE"
+			fi
 		fi
 		
 		[ "$CHOICE" = q ] && exit 255 # force-quit
@@ -189,7 +214,7 @@ download)
 			goto_sel="`getsel "$tmp" $index 2`"
 			goto_port="`getsel "$tmp" $index 4`"
 			goto_mode="`getsel "$tmp" $index 1 | cut -c1`"
-			echo "Digging to [$goto_server:$goto_port] [$goto_sel]..."
+			echo "Digging to [$goto_server:$goto_port] $index [$goto_sel]..."
 			sh "$0" "$goto_server" "$goto_sel" "$goto_port" "$goto_mode"
 			[ $? = 255 ] && exit 255 # force-quit
 		fi