mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2026-01-30 14:20:37 +03:00
updater: Fix files renaming
This commit is contained in:
@@ -345,7 +345,7 @@ if [ "$opt_update" != "" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
ZAP_PKG_DIR=/tmp/zapret_pkg
|
ZAP_PKG_DIR=/tmp/zapret_pkg
|
||||||
rm -rf $ZAP_PKG_DIR
|
rm -rf $ZAP_PKG_DIR 2>/dev/null
|
||||||
ZAP_PKG_HDRS=$( curl -s -I -L --max-time $CURL_TIMEOUT -H "$CURL_HEADER2" "$ZAP_PKG_URL" )
|
ZAP_PKG_HDRS=$( curl -s -I -L --max-time $CURL_TIMEOUT -H "$CURL_HEADER2" "$ZAP_PKG_URL" )
|
||||||
ZAP_PKG_SIZE=$( echo "$ZAP_PKG_HDRS" | grep -i 'content-length: ' | tail -n1 | awk '{print $2}' | tr -d '\r' )
|
ZAP_PKG_SIZE=$( echo "$ZAP_PKG_HDRS" | grep -i 'content-length: ' | tail -n1 | awk '{print $2}' | tr -d '\r' )
|
||||||
echo "Downloded ZIP-file size = $ZAP_PKG_SIZE bytes"
|
echo "Downloded ZIP-file size = $ZAP_PKG_SIZE bytes"
|
||||||
@@ -371,16 +371,16 @@ if [ "$opt_update" != "" ]; then
|
|||||||
return 218
|
return 218
|
||||||
fi
|
fi
|
||||||
unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
|
unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
|
||||||
rm -f "$ZAP_PKG_FN"
|
rm -f "$ZAP_PKG_FN" 2>/dev/null
|
||||||
if [ "$PKG_MGR" = "apk" ]; then
|
if [ "$PKG_MGR" = "apk" ]; then
|
||||||
if [ ! -d "$ZAP_PKG_DIR/apk" ]; then
|
if [ ! -d "$ZAP_PKG_DIR/apk" ]; then
|
||||||
echo "ERROR: APK-files not founded"
|
echo "ERROR: APK-files not founded"
|
||||||
return 221
|
return 221
|
||||||
fi
|
fi
|
||||||
rm -f "$ZAP_PKG_DIR/*.ipk"
|
rm -f $ZAP_PKG_DIR/*.ipk 2>/dev/null
|
||||||
mv "$ZAP_PKG_DIR/apk/*" "$ZAP_PKG_DIR/"
|
mv $ZAP_PKG_DIR/apk/* $ZAP_PKG_DIR/
|
||||||
else
|
else
|
||||||
rm -rf "$ZAP_PKG_DIR/apk"
|
rm -rf $ZAP_PKG_DIR/apk 2>/dev/null
|
||||||
fi
|
fi
|
||||||
ZAP_PKG_LIST=$( ls -1 "$ZAP_PKG_DIR" )
|
ZAP_PKG_LIST=$( ls -1 "$ZAP_PKG_DIR" )
|
||||||
echo "------ Downloaded packages:"
|
echo "------ Downloaded packages:"
|
||||||
|
|||||||
Reference in New Issue
Block a user