mirror of
https://github.com/kellymichels/zscripts-token-savers
synced 2026-10-07 07:18:18 +00:00
09f86c1cba
* feat(bash): native bash port of all z-scripts for Linux/macOS/WSL Full port: zhelpers.sh library (jq config, ssh, http/tcp, archive builder, build-version, motd, port-kill), all commands (zstart/zkill/zrestart/zstop, zdeploy with 5 kind handlers, zec2/zec2online/zrepair, zbackup/zbackup_ec2/ zsync/zbackup_and_sync, zstart_docker, zsetup_mail, setup_backup_schedule via cron), Unix-path zconfig.example.json, and a bash/README.md. Verified: bash -n clean on all scripts; archive exclusions, config semantics, and zec2 tested against the real config and live server from Git Bash. Needs a Linux/macOS/WSL shakedown for lsof/rsync/nohup paths before merging. * chore: pin line endings (.gitattributes) - bash LF, powershell CRLF * docs(readme): point Linux/macOS/WSL users at the bash port * fix(bash): don't run the Windows venv python.exe on WSL/Linux/macOS zstart's venv detection fell back to .venv/Scripts/python.exe (a Windows binary) whenever it existed. On a Windows-built project accessed from WSL that file sits on the mount and looks executable, so it got picked and failed with 'exec format error' instead of falling through to python3. Guard that branch to Windows-family shells (msys/cygwin), where a .exe can actually run. Verified on WSL: zstart --detached now backgrounds a stdlib app via python3, serves HTTP 200, logs to /tmp/zstart-<key>.log, and zkill terminates it and frees the port. * feat(bash): add token-usage tracking to the bash port (#6) Adds z_track_start/z_track_stop + z_record to zhelpers.sh and wires z_track_start into every command script. Each run now captures its own output volume (FIFO+tee, ANSI stripped), prints the '--- N lines / N chars / ~N tokens est. (Claude Code) ---' footer, and appends one JSONL row per top-level run in the same shape as the PowerShell tokens.jsonl. A nested-run guard keeps zrestart from double-counting its zkill/zstart children. Data dir precedence: $ZTOKENS_DATA, config ztokens.dataDir, sibling ../../ztokens/data, else ~/.ztokens/data. Docs + example config updated. Verified on WSL (isolated data dir): single run records correctly; nested zrestart produces one combined record, not three; est = round(chars/3.5).
52 lines
1.8 KiB
Bash
52 lines
1.8 KiB
Bash
#!/usr/bin/env bash
|
|
# Evomedia.net Token Savers — https://github.com/kellymichels/zscripts-token-savers
|
|
# Created by Kelly Michels · dev@evomedia.net
|
|
# Licensed under the MIT License. See LICENSE.
|
|
#
|
|
# setup_backup_schedule — schedule daily zbackup_and_sync via cron.
|
|
# (The PowerShell version creates a Windows Scheduled Task; this is the cron equivalent.)
|
|
#
|
|
# Usage:
|
|
# setup_backup_schedule # print the crontab line to add
|
|
# setup_backup_schedule --install # append it to your crontab (2:00 AM daily)
|
|
# setup_backup_schedule --time 03:30 --install
|
|
|
|
set -uo pipefail
|
|
_HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
source "$_HERE/zhelpers.sh"
|
|
z_track_start "$@"
|
|
|
|
install=0; at_time="02:00"
|
|
while [ $# -gt 0 ]; do
|
|
case "$1" in
|
|
--install) install=1; shift ;;
|
|
--time) at_time="${2:-02:00}"; shift 2 ;;
|
|
*) err "Unknown option: $1"; exit 1 ;;
|
|
esac
|
|
done
|
|
|
|
hh="${at_time%%:*}"; mm="${at_time##*:}"
|
|
if ! [[ "$hh" =~ ^[0-9]{1,2}$ && "$mm" =~ ^[0-9]{2}$ ]] || [ "$hh" -gt 23 ] || [ "$mm" -gt 59 ]; then
|
|
err "Invalid --time '$at_time' (expected HH:MM, 24h)"; exit 1
|
|
fi
|
|
|
|
cron_line="${mm#0} ${hh#0} * * * $_HERE/zbackup_and_sync >> \$HOME/zbackup_and_sync.log 2>&1"
|
|
|
|
info "=== Backup schedule (cron) ==="
|
|
dim "Daily at $at_time:"
|
|
printf '\n %s\n\n' "$cron_line"
|
|
|
|
if [ "$install" -eq 1 ]; then
|
|
z_require crontab
|
|
if crontab -l 2>/dev/null | grep -qF "$_HERE/zbackup_and_sync"; then
|
|
warn "A crontab entry for zbackup_and_sync already exists - not adding a duplicate."
|
|
dim "Edit it with: crontab -e"
|
|
exit 0
|
|
fi
|
|
( crontab -l 2>/dev/null; printf '%s\n' "$cron_line" ) | crontab - \
|
|
|| { err "Failed to update crontab."; exit 1; }
|
|
ok "Installed. Verify with: crontab -l"
|
|
else
|
|
dim "Run with --install to add it to your crontab, or add it manually with: crontab -e"
|
|
fi
|