* Use greedy matching where appropriate in kaoget.sh.

* Refactored make_kix() in kaoget.sh.

diff --git a/kaoget.sh b/kaoget.sh
index 2891e60185a1efe0de6474088f576017196a95c1..d8433954306d4e5eadc96e3f71e92adca55c5f6d 100755 (executable)
--- a/kaoget.sh
+++ b/kaoget.sh
@@ -63,24 +63,23 @@ esac
 
 
 function make_kix {
-  u="$1"
-  n=
-  case "$u" in
+  KIX="$1"
+  case "$KIX" in
    */dl.php*f=* )
-    n=${u#*f=}
-    n=${n%&*}
+    KIX=${KIX#*f=}
+    KIX=${KIX%%&*}
     ;;
    */leech* )
-    n=${u#*p=}
-    n=${n%%&*}
+    KIX=${KIX#*p=}
+    KIX=${KIX%%&*}
     ;;
    * )
-    n=$(mktemp --dry-run kaoget_XXXX)
+    KIX=$(mktemp --dry-run kaoget_XXXX)
     ;;
   esac
-  n="$(echo $n | sed "s@+@ @g;s@%@\\\\x@g" | xargs -0 printf "%b")"
-  n="${n##*/}.kix"
-  echo "$n"
+  KIX="$(echo $KIX | sed "s@+@ @g;s@%@\\\\x@g" | xargs -0 printf "%b")"
+  KIX="${KIX##*/}.kix"
+  echo "$KIX"
 }
 
 case "$URL_FILE" in
@@ -113,11 +112,10 @@ while read URL; do
   case "$URL" in
      */dl.php*f=* )
       NAME=${URL#*f=}
-      NAME=${NAME%&*}
+      NAME=${NAME%%&*}
       ;;
      */leech/*~* )
-      NAME=${URL#*~}
-      NAME=${NAME#*~}
+      NAME=${URL##*~}
       NAME=$(echo $NAME | sed "s@+@ @g;s@%@\\\\x@g" | xargs -0 printf "%b")
       ;;
      * )