#! /bin/sh
-current="`git config --get --path remote.current.url`"
-origin="`git config --get --path remote.origin.url`"
-
-if [ -n "$origin" ]; then
- if [ -n "$current" ]; then
- echo "UNKNOWN ERROR"
- else
- echo "This script must be run in the origin directory: $origin"
- fi >&2
- exit 1
-elif [ -z "$current" ]; then
- echo "UNKNOWN ERROR" >&2
- exit 1
-fi
+"$HOME"/admin/prog/git-scripts/update || exit 1
-git pull --ff-only current master &&
-
-web="`git config --get --path remote.web.url`" &&
-[ -n "$web" ] && git push web
+current="`git config --get --path remote.current.url`"
# Copy templates and generated files with timestamps to avoid rebuilding
rsync -ahP "$current"/html/html.py "$current"/html/html.tmpl \