Corrected trailing commas in permissions.json by using jq

Fixes #117
This commit is contained in:
Geoff Bourne committed 2020-12-08 12:37:09 -06:00
1 parent dd738d65f9
commit b4c249e4c4
1 file changed
+6 -12
+6 -12
View File
@@ -101,23 +101,17 @@ fi
if [ -n "$OPS" ] || [ -n "$MEMBERS" ] || [ -n "$VISITORS" ]; then if [ -n "$OPS" ] || [ -n "$MEMBERS" ] || [ -n "$VISITORS" ]; then
echo "Updating permissions" echo "Updating permissions"
echo "[" > permissions.json jq -n --arg ops "$OPS" --arg members "$MEMBERS" --arg visitors "$VISITORS" '[
if [ -n "$OPS" ]; then [$ops | split(",") | map({permission: "operator", xuid:.})],
echo $OPS | awk -v RS=, '{print "{ \"permission\": \"operator\", \"xuid\": \"" $1 "\" },"}' >> permissions.json [$members | split(",") | map({permission: "member", xuid:.})],
fi [$visitors | split(",") | map({permission: "visitor", xuid:.})]
if [ -n "$MEMBERS" ]; then ]| flatten' > permissions.json
echo $MEMBERS | awk -v RS=, '{print "{ \"permission\": \"member\", \"xuid\": \"" $1 "\" },"}' >> permissions.json
fi
if [ -n "$VISITORS" ]; then
echo $VISITORS | awk -v RS=, '{print "{ \"permission\": \"visitor\", \"xuid\": \"" $1 "\" },"}' >> permissions.json
fi
echo "]" >> permissions.json
fi fi
if [ -n "$WHITE_LIST_USERS" ]; then if [ -n "$WHITE_LIST_USERS" ]; then
echo "Setting whitelist" echo "Setting whitelist"
rm -rf whitelist.json rm -rf whitelist.json
echo "$WHITE_LIST_USERS" | jq -R 'split(",") | map({"name": .})' > whitelist.json jq -n --arg users "$WHITE_LIST_USERS" '$users | split(",") | map({"name": .})' > whitelist.json
# flag whitelist to true so the server properties process correctly # flag whitelist to true so the server properties process correctly
export WHITE_LIST=true export WHITE_LIST=true
fi fi