Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix missing single quotes for urls and json path #2036

Merged
merged 1 commit into from Feb 14, 2022
Merged

fix missing single quotes for urls and json path #2036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion openwb.conf
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ sdm630modbusllsource=/dev/ttyUSB0
sdm630modbuslllanip=10.20.0.180
socmodul=soc_http
hsocip='10.0.0.110/soc.txt'
hsocip1=http://10.0.0.110/soc.txt
hsocip1='http://10.0.0.110/soc.txt'
nachtladen=0
nachtll=32
nachtladenabuhr=17
Expand Down
80 changes: 64 additions & 16 deletions runs/updateConfig.sh
View file
Open in desktop
Expand Up @@ -6,10 +6,14 @@ updateConfig(){
echo "Updating $ConfigFile..."

if ! grep -Fq "wr_http_w_url=" $ConfigFile; then
echo "wr_http_w_url=http://192.168.0.17/pvwatt.txt" >> $ConfigFile
echo "wr_http_w_url='http://192.168.0.17/pvwatt.txt'" >> $ConfigFile
else
sed -i "/wr_http_w_url='/b; s/^wr_http_w_url=\(.*\)/wr_http_w_url=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "hsocip1=" $ConfigFile; then
echo "hsocip1=http://10.0.0.110/soc.txt" >> $ConfigFile
echo "hsocip1='http://10.0.0.110/soc.txt'" >> $ConfigFile
else
sed -i "/hsocip1='/b; s/^hsocip1=\(.*\)/hsocip1=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "socmodul1=" $ConfigFile; then
echo "socmodul1=soc_http1" >> $ConfigFile
Expand All @@ -18,7 +22,9 @@ updateConfig(){
echo "dacregisters1=12" >> $ConfigFile
fi
if ! grep -Fq "wr_http_kwh_url=" $ConfigFile; then
echo "wr_http_kwh_url=http://192.168.0.17/pvwh.txt" >> $ConfigFile
echo "wr_http_kwh_url='http://192.168.0.17/pvwh.txt'" >> $ConfigFile
else
sed -i "/wr_http_kwh_url='/b; s/^wr_http_kwh_url=\(.*\)/wr_http_kwh_url=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "smaemdbezugid=" $ConfigFile; then
echo "smaemdbezugid=1900123456" >> $ConfigFile
Expand All @@ -34,13 +40,19 @@ updateConfig(){
echo "smaemdllid=1900123456" >> $ConfigFile
fi
if ! grep -Fq "bezug_http_w_url=" $ConfigFile; then
echo "bezug_http_w_url=http://192.168.0.17/bezugwatt.txt" >> $ConfigFile
echo "bezug_http_w_url='http://192.168.0.17/bezugwatt.txt'" >> $ConfigFile
else
sed -i "/bezug_http_w_url='/b; s/^bezug_http_w_url=\(.*\)/bezug_http_w_url=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "bezug_http_ikwh_url=" $ConfigFile; then
echo "bezug_http_ikwh_url=http://192.168.0.17/bezugwh.txt" >> $ConfigFile
echo "bezug_http_ikwh_url='http://192.168.0.17/bezugwh.txt'" >> $ConfigFile
else
sed -i "/bezug_http_ikwh_url='/b; s/^bezug_http_ikwh_url=\(.*\)/bezug_http_ikwh_url=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "bezug_http_ekwh_url=" $ConfigFile; then
echo "bezug_http_ekwh_url=http://192.168.0.17/einspeisungwh.txt" >> $ConfigFile
echo "bezug_http_ekwh_url='http://192.168.0.17/einspeisungwh.txt'" >> $ConfigFile
else
sed -i "/bezug_http_ekwh_url='/b; s/^bezug_http_ekwh_url=\(.*\)/bezug_http_ekwh_url=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "minimalapv=" $ConfigFile; then
echo "minimalapv=6" >> $ConfigFile
Expand Down Expand Up @@ -358,21 +370,33 @@ updateConfig(){
fi
if ! grep -Fq "wrjsonwatt=" $ConfigFile; then
echo "wrjsonwatt='.watt'" >> $ConfigFile
else
sed -i "/wrjsonwatt='/b; s/^wrjsonwatt=\(.*\)/wrjsonwatt=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "wrjsonkwh=" $ConfigFile; then
echo "wrjsonkwh='.kwh'" >> $ConfigFile
else
sed -i "/wrjsonkwh='/b; s/^wrjsonkwh=\(.*\)/wrjsonkwh=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "wrjsonurl=" $ConfigFile; then
echo "wrjsonurl=http://192.168.0.12/solar_api" >> $ConfigFile
echo "wrjsonurl='http://192.168.0.12/solar_api'" >> $ConfigFile
else
sed -i "/wrjsonurl='/b; s/^wrjsonurl=\(.*\)/wrjsonurl=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "wr2jsonwatt=" $ConfigFile; then
echo "wr2jsonwatt='.watt'" >> $ConfigFile
else
sed -i "/wr2jsonwatt='/b; s/^wr2jsonwatt=\(.*\)/wr2jsonwatt=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "wr2jsonkwh=" $ConfigFile; then
echo "wr2jsonkwh='.kwh'" >> $ConfigFile
else
sed -i "/wr2jsonkwh='/b; s/^wr2jsonkwh=\(.*\)/wr2jsonkwh=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "wr2jsonurl=" $ConfigFile; then
echo "wr2jsonurl=http://192.168.0.12/solar_api" >> $ConfigFile
echo "wr2jsonurl='http://192.168.0.12/solar_api'" >> $ConfigFile
else
sed -i "/wr2jsonurl='/b; s/^wr2jsonurl=\(.*\)/wr2jsonurl=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "hausbezugnone=" $ConfigFile; then
echo "hausbezugnone=200" >> $ConfigFile
Expand Down Expand Up @@ -415,15 +439,23 @@ updateConfig(){
fi
if ! grep -Fq "bezugjsonwatt=" $ConfigFile; then
echo "bezugjsonwatt='.watt'" >> $ConfigFile
else
sed -i "/bezugjsonwatt='/b; s/^bezugjsonwatt=\(.*\)/bezugjsonwatt=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "bezugjsonkwh=" $ConfigFile; then
echo "bezugjsonkwh='.kwh'" >> $ConfigFile
else
sed -i "/bezugjsonkwh='/b; s/^bezugjsonkwh=\(.*\)/bezugjsonkwh=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "einspeisungjsonkwh=" $ConfigFile; then
echo "einspeisungjsonkwh='.kwh'" >> $ConfigFile
else
sed -i "/einspeisungjsonkwh='/b; s/^einspeisungjsonkwh=\(.*\)/einspeisungjsonkwh=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "bezugjsonurl=" $ConfigFile; then
echo "bezugjsonurl=http://192.168.0.12/solar_api" >> $ConfigFile
echo "bezugjsonurl='http://192.168.0.12/solar_api'" >> $ConfigFile
else
sed -i "/bezugjsonurl='/b; s/^bezugjsonurl=\(.*\)/bezugjsonurl=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "mpm3pmlls1source=" $ConfigFile; then
echo "mpm3pmlls1source=/dev/ttyUSB0" >> $ConfigFile
Expand Down Expand Up @@ -474,23 +506,36 @@ updateConfig(){
echo "displayEinBeimAnstecken=1" >> $ConfigFile
fi
if ! grep -Fq "speicherleistung_http=" $ConfigFile; then
echo "speicherleistung_http=192.168.0.10/watt" >> $ConfigFile
echo "speicherleistung_http='192.168.0.10/watt'" >> $ConfigFile
else
sed -i "/speicherleistung_http='/b; s/^speicherleistung_http=\(.*\)/speicherleistung_http=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "speichersoc_http=" $ConfigFile; then
echo "speichersoc_http=192.168.0.10/soc" >> $ConfigFile
echo "speichersoc_http='192.168.0.10/soc'" >> $ConfigFile
else
sed -i "/speichersoc_http='/b; s/^speichersoc_http=\(.*\)/speichersoc_http=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "speicherekwh_http=" $ConfigFile; then
echo "speicherekwh_http=192.168.0.10/eWh" >> $ConfigFile
echo "speicherikwh_http=192.168.0.10/iWh" >> $ConfigFile
echo "speicherekwh_http='192.168.0.10/eWh'" >> $ConfigFile
echo "speicherikwh_http='192.168.0.10/iWh'" >> $ConfigFile
else
sed -i "/speicherekwh_http='/b; s/^speicherekwh_http=\(.*\)/speicherekwh_http=\'\1\'/g" $ConfigFile
sed -i "/speicherikwh_http='/b; s/^speicherikwh_http=\(.*\)/speicherikwh_http=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "battjsonurl=" $ConfigFile; then
echo "battjsonurl=192.168.0.10/speicher" >> $ConfigFile
echo "battjsonurl='192.168.0.10/speicher'" >> $ConfigFile
else
sed -i "/battjsonurl='/b; s/^battjsonurl=\(.*\)/battjsonurl=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "battjsonsoc=" $ConfigFile; then
echo "battjsonsoc='.RSOC'" >> $ConfigFile
else
sed -i "/battjsonsoc='/b; s/^battjsonsoc=\(.*\)/battjsonsoc=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "battjsonwatt=" $ConfigFile; then
echo "battjsonwatt='.Consumption_W'" >> $ConfigFile
else
sed -i "/battjsonwatt='/b; s/^battjsonwatt=\(.*\)/battjsonwatt=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "soc_tesla_username=" $ConfigFile; then
echo "soc_tesla_username=deine@email.com" >> $ConfigFile
Expand Down Expand Up @@ -1987,11 +2032,14 @@ updateConfig(){
echo "soc_eq_client_id_lp1=ID" >> $ConfigFile
echo "soc_eq_client_secret_lp1=Secret" >> $ConfigFile
echo "soc_eq_vin_lp1=VIN" >> $ConfigFile
echo "soc_eq_cb_lp1=http://openWB/openWB/modules/soc_eq/callback_lp1.php" >> $ConfigFile
echo "soc_eq_cb_lp1='http://openWB/openWB/modules/soc_eq/callback_lp1.php'" >> $ConfigFile
echo "soc_eq_client_id_lp2=ID" >> $ConfigFile
echo "soc_eq_client_secret_lp2=Secret" >> $ConfigFile
echo "soc_eq_vin_lp2=VIN" >> $ConfigFile
echo "soc_eq_cb_lp2=http://openWB/openWB/modules/soc_eq/callback_lp2.php" >> $ConfigFile
echo "soc_eq_cb_lp2='http://openWB/openWB/modules/soc_eq/callback_lp2.php'" >> $ConfigFile
else
sed -i "/soc_eq_cb_lp1='/b; s/^soc_eq_cb_lp1=\(.*\)/soc_eq_cb_lp1=\'\1\'/g" $ConfigFile
sed -i "/soc_eq_cb_lp2='/b; s/^soc_eq_cb_lp2=\(.*\)/soc_eq_cb_lp2=\'\1\'/g" $ConfigFile
fi
if ! grep -Fq "soc_id_username=" $ConfigFile; then
echo "soc_id_username=User" >> $ConfigFile
Expand Down