Update shared.cgi to reduce /configs interaction

This commit is contained in:
virmaior 2024-02-17 23:30:17 +09:00 committed by gtxaspec
parent 8cc7f59184
commit 255e672603

View File

@ -2,23 +2,55 @@
# This provides shared values for webpages # This provides shared values for webpages
base_dir=/opt/wz_mini/ base_dir="/opt/wz_mini"
base_hack_ini=/opt/wz_mini/wz_mini.conf tmp_dir="$base_dir/tmp"
hack_ini=$base_hack_ini base_hack_ini="$base_dir/wz_mini.conf"
www_dir=/opt/wz_mini/www/cgi-bin/ hack_ini="$base_hack_ini"
www_dir="$base_dir/www/cgi-bin/"
www_env="$tmp_dir/www_env.sh"
if [ -f /opt/wz_mini/tmp/.T31 ]; then function echoset
camtype=T31 {
camfirmware=$(tail -n1 /configs/app.ver | cut -f2 -d= ) eval "$1='$2'"
base_cam_config="/configs/.user_config" echo "$1"="\"$2\"" >> "$www_env"
elif [ -f /opt/wz_mini/tmp/.T20 ]; then }
camtype=T20
camfirmware=$(tail -n1 /system/bin/app.ver | cut -f2 -d= ) function compose_www_env
base_cam_config="/configs/.parameters" {
if [ -f "$tmp_dir/.T31" ]; then
echoset "camtype" "T31"
echoset "base_cam_config" "/configs/.user_config"
echoset "camfirmware" $(tail -n1 /configs/app.ver | cut -f2 -d= )
elif [ -f "$tmp_dir/.T20" ]; then
echoset "camtype" "T20"
echoset "base_cam_config" "/configs/.parameters"
echoset "camfirmware" $(tail -n1 /system/bin/app.ver | cut -f2 -d= )
fi
echoset "cammodel" $(/opt/wz_mini/etc/init.d/s04model start | grep detected | cut -f1 -d ' ' )
echoset camver "$camtype($cammodel)"
echoset hackver "$(cat /opt/wz_mini/usr/bin/app.ver)"
echoset gpiopath "/sys/devices/virtual/gpio"
echoset recpath '/opt/record/';
echoset sysTZ $(cat /etc/TZ)
echoset TZ $(cat "$tmp_dir/TZ")
}
function read_www_env
{
. "$www_env"
}
if [ ! -f "$www_env" ]; then
compose_www_env
else
read_www_env
fi fi
cam_config=$base_cam_config
cammodel=$(/opt/wz_mini/etc/init.d/s04model start | grep detected | cut -f1 -d ' ' )
cam_config="$base_cam_config"
camver="$camtype($cammodel)" camver="$camtype($cammodel)"
@ -27,6 +59,7 @@ hackver=$(cat /opt/wz_mini/usr/bin/app.ver)
ipaddr=$(ifconfig wlan0 | grep inet | cut -d ':' -f2 | cut -d ' ' -f0) ipaddr=$(ifconfig wlan0 | grep inet | cut -d ':' -f2 | cut -d ' ' -f0)
macaddr=$(ifconfig wlan0 | grep HWaddr | cut -d 'HW' -f2 | cut -d ' ' -f2) macaddr=$(ifconfig wlan0 | grep HWaddr | cut -d 'HW' -f2 | cut -d ' ' -f2)
function handle_css function handle_css
{ {
echo -ne "<style type=\"text/css\">" echo -ne "<style type=\"text/css\">"
@ -35,7 +68,6 @@ echo -ne '</style>';
} }
function version_info function version_info
{ {
echo "<div id='$1'>" echo "<div id='$1'>"
@ -150,4 +182,3 @@ fi
} }