Skip to content
This repository was archived by the owner on Oct 9, 2024. It is now read-only.

Commit 9f0cf22

Browse files
committed
FriendlyWrt: busybox sed & awk
1 parent 0ff5e7d commit 9f0cf22

3 files changed

Lines changed: 16 additions & 12 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages/ipkbuild/speedifyunofficial/control.tar.gz
22
packages/ipkbuild/speedifyunofficial/data.tar.gz
3-
packages/speedifyunofficial_1.0_all.ipk
3+
packages/*.ipk

pack.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
VERSION="1.1"
4+
35
pushd packages/ipkbuild/speedifyunofficial/control/
46
rm ../control.tar.gz
57
tar --numeric-owner --group=0 --owner=0 -czf ../control.tar.gz ./*
@@ -11,6 +13,6 @@ tar --numeric-owner --group=0 --owner=0 -czf ../data.tar.gz ./*
1113
popd
1214

1315
pushd packages/ipkbuild/speedifyunofficial
14-
rm ../../speedifyunofficial_1.0_all.ipk
15-
tar --numeric-owner --group=0 --owner=0 -czf ../../speedifyunofficial_1.0_all.ipk ./debian-binary ./data.tar.gz ./control.tar.gz
16+
rm ../../speedifyunofficial*
17+
tar --numeric-owner --group=0 --owner=0 -czf ../../speedifyunofficial_${VERSION}_all.ipk ./debian-binary ./data.tar.gz ./control.tar.gz
1618
popd

packages/ipkbuild/speedifyunofficial/data/usr/lib/speedifyunofficial/run.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
ACTION="${1:-start}"
66
PKGS=/tmp/spdpkgs
7+
SED="busybox sed"
8+
AWK="busybox awk"
79

810
config_load speedifyunofficial
911

@@ -24,7 +26,7 @@ run_speedify (){
2426

2527
parse_versions(){
2628
APT=$(config_get Setup apt)
27-
APT=$(echo $APT | sed -e 's/\/$//')
29+
APT=$(echo $APT | $SED -e 's/\/$//')
2830
echo Repository URL:$APT
2931
aptURL="$APT$SPDDIR"
3032
echo Repository Ubuntu packages URL:$aptURL
@@ -35,31 +37,31 @@ parse_versions(){
3537

3638
parse_apt_url(){
3739
APT=$(config_get Setup apt)
38-
APT=$(echo $APT | sed -e 's/\/$//')
40+
APT=$(echo $APT | $SED -e 's/\/$//')
3941
echo Repository URL:$APT
4042
aptURL="$APT$SPDDIR"
4143
echo Repository Ubuntu packages URL:$aptURL
4244
curl -o $PKGS $aptURL
4345

44-
DWVER=$(awk '/Version:/{gsub("Version: ", "");print;exit}' $PKGS)
46+
DWVER=$($AWK '/Version:/{gsub("Version: ", "");print;exit}' $PKGS)
4547
echo Latest Version:$DWVER
4648

47-
SPDDW=$(awk '/Filename/{gsub("Filename: ", "");print;exit}' $PKGS)
49+
SPDDW=$($AWK '/Filename/{gsub("Filename: ", "");print;exit}' $PKGS)
4850
export DWURL=$APT/$SPDDW
4951
echo Speedify package URL:$DWURL
5052

51-
UIDW=$(sed -n '/speedifyui/{nnnnnnnn;p;q}' $PKGS | awk '/Filename/{gsub("Filename: ", "");print;exit}')
53+
UIDW=$($SED -n '/speedifyui/{nnnnnnnn;p;q}' $PKGS | $AWK '/Filename/{gsub("Filename: ", "");print;exit}')
5254
export UIDWURL=$APT/$UIDW
5355
echo Speedify UI package URL:$UIDWURL
5456

5557
if [[ $(config_get Setup verovd) ]]; then
5658
echo "Version override is set!"
5759
DWVER=$(config_get Setup verovd)
5860
echo "Set to $DWVER"
59-
SPDDW=$(sed -n '/'"$DWVER"'/{nn;p;q}' $PKGS | awk '/Filename/{gsub("Filename: ", "");print;exit}')
61+
SPDDW=$($SED -n '/'"$DWVER"'/{nn;p;q}' $PKGS | $AWK '/Filename/{gsub("Filename: ", "");print;exit}')
6062
export DWURL=$APT/$SPDDW
6163
echo Speedify package URL:$DWURL
62-
UIDW=$(sed -n '/'"$DWVER"'/{nn;p;q}' $PKGS | awk '/Filename/{gsub("Filename: ", "");print;exit}' | sed 's/speedify/speedifyui/g')
64+
UIDW=$($SED -n '/'"$DWVER"'/{nn;p;q}' $PKGS | $AWK '/Filename/{gsub("Filename: ", "");print;exit}' | $SED 's/speedify/speedifyui/g')
6365
export UIDWURL=$APT/$UIDW
6466
echo Speedify UI package URL:$UIDWURL
6567
fi
@@ -180,8 +182,8 @@ else
180182
echo "Update on boot enabled."
181183
echo "Checking for updates..."
182184
parse_apt_url
183-
CURRVER=$(config_get Setup version | awk -F '|' -v 'OFS=|' '{ gsub(/[^0-9]/,"",$NF); print}')
184-
DWVER=$(echo $DWVER | awk -F '|' -v 'OFS=|' '{ gsub(/[^0-9]/,"",$NF); print}')
185+
CURRVER=$(config_get Setup version | $AWK -F '|' -v 'OFS=|' '{ gsub(/[^0-9]/,"",$NF); print}')
186+
DWVER=$(echo $DWVER | $AWK -F '|' -v 'OFS=|' '{ gsub(/[^0-9]/,"",$NF); print}')
185187
echo "Current version: $CURRVER"
186188
echo "Repo version: $DWVER"
187189
if [ "$DWVER" -gt "$CURRVER" ]; then

0 commit comments

Comments
 (0)