Browse Source

better form naming scheme

Tobias Simetsreiter 4 years ago
parent
commit
f192b4dd0f

+ 4 - 0
Makefile

@@ -5,6 +5,10 @@ build: build/bootstrap_captive.sha256
 
 
 rebuild: clean build
 rebuild: clean build
 
 
+update: rebuild
+	rsync build/bootstrap_captive  ${DEPLOY_REMOTE}:/usr/local/bin/
+	ssh  ${DEPLOY_REMOTE} "bootstrap_captive unpack && systemctl restart bootstrap_captive_server"
+
 build/src: src
 build/src: src
 	mkdir -p build
 	mkdir -p build
 	rsync -ai --delete --exclude __pycache__ src/ build/src/
 	rsync -ai --delete --exclude __pycache__ src/ build/src/

+ 1 - 1
src/bootstrap_captive/api/__init__.py

@@ -19,7 +19,7 @@ def get_form(inp):
                 continue
                 continue
             with open(jsfile) as fd:
             with open(jsfile) as fd:
                 js = json.load(fd)
                 js = json.load(fd)
-                js["name"] = f
+                js["name"] = f[:-5]
                 try:
                 try:
                     js = mod.get_form(js)
                     js = mod.get_form(js)
                 except Exception as ex:
                 except Exception as ex:

+ 0 - 0
src/bootstrap_captive/form/wifi.json → src/bootstrap_captive/form/23-wifi.json


+ 0 - 0
src/bootstrap_captive/form/wifi.py → src/bootstrap_captive/form/23-wifi.py


+ 0 - 0
src/bootstrap_captive/form/services.json → src/bootstrap_captive/form/42-systemd.json


+ 0 - 0
src/bootstrap_captive/form/services.py → src/bootstrap_captive/form/42-systemd.py