Fix wget -S spider result condition. See: https://gitlab.com/sc0ttj/P…

…kg/issues/69
puppylinux-woof-CE · Oct 16, 2019 · 0ab77c8 · 0ab77c8
1 parent b5d1483
commit 0ab77c8
Show file tree

Hide file tree

Showing 2 changed files with 7,790 additions and 1 deletion.
diff --git a/woof-code/rootfs-packages/PKG/usr/sbin/pkg b/woof-code/rootfs-packages/PKG/usr/sbin/pkg
@@ -4453,9 +4453,14 @@ pkg_download(){                   # download a pkg ($1) to WORKDIR FUNCLIST
             [ "$sub_dir" != '' ] && DOWNLOAD_URL="`echo "$DOWNLOAD_URL"| sed -e "s@//${sub_dir}@/${sub_dir}@g" -e "s@${sub_dir}//@${sub_dir}/@g"`"
 
             # exit if URL is not found (if we get a 404 back)
-            if [ -z "$DOWNLOAD_URL" -o "`wget -S --spider "$DOWNLOAD_URL" 2>&1 | grep -m1 'HTTP/1.1 404 Not Found'`" != '' ]; then
+            if [ -z "$DOWNLOAD_URL" ]; then
               error "Package URL not found   $DOWNLOAD_URL"
               return 8
+            else
+              wget -S --spider "$DOWNLOAD_URL" || { \
+                error "Package URL not found   $DOWNLOAD_URL"
+                return 8				  
+			  }
             fi
 
             # we may be using multiple URLs, so each time we change URL,