bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging traffic data into users.json

Browse Source
This commit is contained in:
Whispering Wind
2024-08-23 13:55:12 +03:30
committed by GitHub
parent 8ac9bf5b30
commit d0842e2adc
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
upgrade.sh
View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
cd /root/ cd /root/
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
@ -34,6 +35,16 @@ for FILE in "${FILES[@]}"; do
cp "$TEMP_DIR/$FILE" "$FILE" cp "$TEMP_DIR/$FILE" "$FILE"
done done
echo "Merging traffic data into users.json"
if [ -f /etc/hysteria/traffic_data.json ]; then
jq -s '.[0] * .[1]' /etc/hysteria/users.json /etc/hysteria/traffic_data.json > /etc/hysteria/users_temp.json
mv /etc/hysteria/users_temp.json /etc/hysteria/users.json
# rm /etc/hysteria/traffic_data.json
else
echo "No traffic_data.json found to merge."
fi
echo "Setting ownership and permissions" echo "Setting ownership and permissions"
chown hysteria:hysteria /etc/hysteria/ca.key /etc/hysteria/ca.crt chown hysteria:hysteria /etc/hysteria/ca.key /etc/hysteria/ca.crt
chmod 640 /etc/hysteria/ca.key /etc/hysteria/ca.crt chmod 640 /etc/hysteria/ca.key /etc/hysteria/ca.crt