From f0da875a46d66764e4870d64a9cf9fb9af14dc2a Mon Sep 17 00:00:00 2001 From: Paul Tyng Date: Wed, 20 May 2020 22:00:09 -0400 Subject: [PATCH] Improve fields fetching --- fields/getjson.sh | 19 ++++++++++++++----- fields/settings.sh | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/fields/getjson.sh b/fields/getjson.sh index 846496a..eb2a107 100644 --- a/fields/getjson.sh +++ b/fields/getjson.sh @@ -1,8 +1,6 @@ #! /bin/bash -#! /bin/bash - -deburl="https://dl.ui.com/unifi/5.12.35/unifi_sysvinit_all.deb" +deburl="https://dl.ui.com/unifi/$1/unifi_sysvinit_all.deb" wkdir="$(mktemp -d)" deb="$wkdir\unifi.deb" @@ -11,6 +9,17 @@ curl -o "$deb" "$deburl" mkdir -p "$wkdir/unifi" dpkg-deb -R "$deb" "$wkdir/unifi" -# cp "$wkdir/unifi/usr/lib/unifi/lib/ace.jar" ./ +cp "$wkdir/unifi/usr/lib/unifi/lib/ace.jar" ./ +unzip -o ace.jar -d ./ace/ -# TODO: extract the JSON field files \ No newline at end of file +mkdir -p "$1" + +cp ./ace/api/fields/*.json "./$1/" + +./settings.sh "$1" + +rm -rf ace ace.jar + +go run main.go "$1" "../unifi/" + +gofmt -w -s ./../unifi/ \ No newline at end of file diff --git a/fields/settings.sh b/fields/settings.sh index d1ce3e2..8196406 100644 --- a/fields/settings.sh +++ b/fields/settings.sh @@ -1,10 +1,10 @@ #! /bin/bash -ver="5.12.35" +ver="$1" keys=$(jq -r keys[] "$ver/Setting.json") while IFS= read -r key; do fn="$(echo $key | sed -r 's/(^|_)([a-z])/\U\2/g')" echo "... $key $fn ..." - jq ".$key" "$ver/Setting.json" >> "$ver/Setting$fn.json" + jq ".$key" "$ver/Setting.json" > "$ver/Setting$fn.json" done <<< "$keys" \ No newline at end of file