root/ubuntu-based-kiosk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix export/import exit on counter increment with set -e

Browse Source 
The script uses 'set -euo pipefail' which causes ((var++)) to exit
when var is 0, since the expression evaluates to 0 (falsey).
Changed to var=$((var + 1)) which always succeeds.
This commit is contained in:
Claude
2025-12-24 02:31:13 +00:00
parent f2f645b7b8
commit 113adeb119
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install_kiosk_v0.9.9.sh
+6 -6
View File
@@ -10114,7 +10114,7 @@ export_settings() {
if [[ -f "/etc/systemd/system/${timer}.timer" ]]; then if [[ -f "/etc/systemd/system/${timer}.timer" ]]; then
sudo cp "/etc/systemd/system/${timer}.timer" "$export_dir/timers/" sudo cp "/etc/systemd/system/${timer}.timer" "$export_dir/timers/"
sudo cp "/etc/systemd/system/${timer}.service" "$export_dir/timers/" 2>/dev/null sudo cp "/etc/systemd/system/${timer}.service" "$export_dir/timers/" 2>/dev/null
((timer_count++)) timer_count=$((timer_count + 1))
fi fi
done done
[[ $timer_count -gt 0 ]] && log_success "Exported $timer_count schedule timers" || log_info "No schedules configured" [[ $timer_count -gt 0 ]] && log_success "Exported $timer_count schedule timers" || log_info "No schedules configured"
@@ -10158,7 +10158,7 @@ export_settings() {
mkdir -p "$export_dir/vpn/wireguard" mkdir -p "$export_dir/vpn/wireguard"
sudo cp /etc/wireguard/*.conf "$export_dir/vpn/wireguard/" 2>/dev/null sudo cp /etc/wireguard/*.conf "$export_dir/vpn/wireguard/" 2>/dev/null
log_success "WireGuard config exported" log_success "WireGuard config exported"
((vpn_count++)) vpn_count=$((vpn_count + 1))
fi fi
# Netbird config and state # Netbird config and state
@@ -10173,7 +10173,7 @@ export_settings() {
# Also check for user config # Also check for user config
[[ -d "$KIOSK_HOME/.netbird" ]] && sudo cp -r "$KIOSK_HOME/.netbird" "$export_dir/vpn/netbird/user-config" 2>/dev/null [[ -d "$KIOSK_HOME/.netbird" ]] && sudo cp -r "$KIOSK_HOME/.netbird" "$export_dir/vpn/netbird/user-config" 2>/dev/null
log_success "Netbird config exported" log_success "Netbird config exported"
((vpn_count++)) vpn_count=$((vpn_count + 1))
fi fi
# OpenVPN configs # OpenVPN configs
@@ -10181,7 +10181,7 @@ export_settings() {
mkdir -p "$export_dir/vpn/openvpn" mkdir -p "$export_dir/vpn/openvpn"
sudo cp -r /etc/openvpn/* "$export_dir/vpn/openvpn/" 2>/dev/null sudo cp -r /etc/openvpn/* "$export_dir/vpn/openvpn/" 2>/dev/null
log_success "OpenVPN config exported" log_success "OpenVPN config exported"
((vpn_count++)) vpn_count=$((vpn_count + 1))
fi fi
# Tailscale - just note if installed (requires re-auth) # Tailscale - just note if installed (requires re-auth)
@@ -10190,7 +10190,7 @@ export_settings() {
echo "tailscale_installed=true" > "$export_dir/vpn/tailscale-info.txt" echo "tailscale_installed=true" > "$export_dir/vpn/tailscale-info.txt"
[[ -n "$ts_name" ]] && echo "hostname=$ts_name" >> "$export_dir/vpn/tailscale-info.txt" [[ -n "$ts_name" ]] && echo "hostname=$ts_name" >> "$export_dir/vpn/tailscale-info.txt"
log_info "Tailscale installed (requires re-authentication after restore)" log_info "Tailscale installed (requires re-authentication after restore)"
((vpn_count++)) vpn_count=$((vpn_count + 1))
fi fi
[[ $vpn_count -eq 0 ]] && log_info "No VPN configurations found" [[ $vpn_count -eq 0 ]] && log_info "No VPN configurations found"
@@ -10288,7 +10288,7 @@ import_settings() {
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl enable "${timer_name}.timer" 2>/dev/null sudo systemctl enable "${timer_name}.timer" 2>/dev/null
sudo systemctl start "${timer_name}.timer" 2>/dev/null sudo systemctl start "${timer_name}.timer" 2>/dev/null
((timer_count++)) timer_count=$((timer_count + 1))
done done
[[ $timer_count -gt 0 ]] && log_success "Restored $timer_count schedule timers" [[ $timer_count -gt 0 ]] && log_success "Restored $timer_count schedule timers"
fi fi