diff --git a/load.sh b/load.sh index bdb0a9e..5477adc 100755 --- a/load.sh +++ b/load.sh @@ -4,10 +4,10 @@ mkdir -p /etc/cleardns/AdGuardHome/ cleardns_dir="/etc/cleardns" overture_dir="/etc/overture" -cd $overture_dir && tar xf asset.tar -[ ! -f "$cleardns_dir/gfwlist.txt" ] && cp "$overture_dir/gfwlist.txt" "$cleardns_dir/gfwlist.txt" -[ ! -f "$cleardns_dir/chinalist.txt" ] && cp "$overture_dir/chinalist.txt" "$cleardns_dir/chinalist.txt" -[ ! -f "$cleardns_dir/china_ip.txt" ] && cp "$overture_dir/china_ip.txt" "$cleardns_dir/china_ip.txt" +cd $overture_dir && tar xf asset.tar.gz +[ ! -f "$cleardns_dir/asset/gfwlist.txt" ] && cp "$overture_dir/gfwlist.txt" "$cleardns_dir/asset/gfwlist.txt" +[ ! -f "$cleardns_dir/asset/chinalist.txt" ] && cp "$overture_dir/chinalist.txt" "$cleardns_dir/asset/chinalist.txt" +[ ! -f "$cleardns_dir/asset/china_ip.txt" ] && cp "$overture_dir/china_ip.txt" "$cleardns_dir/asset/china_ip.txt" upstream_file="/etc/cleardns/upstream.json" if [ ! -f "$upstream_file" ]; then diff --git a/overture/update.sh b/overture/update.sh index 7a96f49..60a8cff 100755 --- a/overture/update.sh +++ b/overture/update.sh @@ -1,6 +1,6 @@ #!/bin/sh ASSET_DIR="/etc/cleardns/asset" -[ -f "$ASSET_DIR/no_auto_update" ] && exit +[ -f "$ASSET_DIR/no_update" ] && exit TEMP_DIR="$ASSET_DIR/temp" rm -rf "$TEMP_DIR" && mkdir -p "$TEMP_DIR"