adblock: update 1.3.1

[feed/packages.git] / net / adblock / files / adblock-helper.sh

diff --git a/net/adblock/files/adblock-helper.sh b/net/adblock/files/adblock-helper.sh
index 5814e85f335229421722378d4518ada8c580ebce..ca8dafe1145ff08a50ee3de2c6b639b18cf6ce89 100644 (file)
--- a/net/adblock/files/adblock-helper.sh
+++ b/net/adblock/files/adblock-helper.sh
@@ -52,7 +52,7 @@ f_envload()
 
     # check opkg availability
     #
-    if [ -r "/var/lock/opkg.lock" ]
+    if [ -f "/var/lock/opkg.lock" ]
     then
         rc=-10
         f_log "adblock installation finished successfully, 'opkg' currently locked by package installer"
@@ -246,9 +246,13 @@ f_envcheck()
         f_depend "libustream-polarssl" "true"
         if [ "${package_ok}" = "false" ]
         then
-            adb_fetch="$(which uclient-fetch)"
-            fetch_parm="-q --timeout=${adb_fetchttl}"
-            response_parm="--spider"
+            f_depend "libustream-\(mbedtls\|openssl\|cyassl\)" "true"
+            if [ "${package_ok}" = "true" ]
+            then
+                adb_fetch="$(which uclient-fetch)"
+                fetch_parm="-q --timeout=${adb_fetchttl}"
+                response_parm="--spider"
+            fi
         fi
     fi
     if [ -z "${adb_fetch}" ]