iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor bug fix
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 30d868e4dae606d244bc2decb19126fda8d70799..0ae24c332cce236812b3d2521bd332edd8f96934 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-24,7
+24,24
@@
m() {
s() { sudo "$@"; }
lnf() { /a/exe/lnf "$@"; }
s() { sudo "$@"; }
lnf() { /a/exe/lnf "$@"; }
-if [[ $1 == -f ]]; then
+now=$(date +%s)
+
+# error prone
+#f=~/.local/conflink
+# fast=false
+# if [[ -e $f ]] && (( $(stat -c %Y $f) > $now - 60*60*24 )); then
+# fast=true
+# fi
+if [[ $1 == -f ]]; then # f for fast
+ fast=true
+ shift
+elif
+ [[ $1 ]]; then
+ echo "error: unrecognized arguments" >&2
+ exit 0
+fi
+
+if $fast; then
lnf() { ln -sf "$@"; }
fi
lnf() { ln -sf "$@"; }
fi
@@
-62,13
+79,19
@@
subdir-link-r() {
}
}
-
common-file-setup() {
common-file-setup() {
- local dir fs x f
+ local dir fs x f systemd_reload
+ systemd_reload=false
for dir in "$@"; do
fs=$dir/filesystem
if [[ -e $fs && $user =~ ^iank?$ ]]; then
for dir in "$@"; do
fs=$dir/filesystem
if [[ -e $fs && $user =~ ^iank?$ ]]; then
+ # this could be done with rsync, something like this,
+ # but I haven't looked at the symlinks.
+ # s rsync -n -ahviSAXPH --specials --devices --chown=root:root --chmod=g-s $fs /
# note, symlinks get resolved, not copied.
# note, symlinks get resolved, not copied.
+ if s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -dz -C / | grep /etc/systemd &>/dev/null; then
+ systemd_reload=true
+ fi
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
@@
-79,6
+102,9
@@
common-file-setup() {
(( ${#x[@]} >= 1 )) || continue
m lnf ${x[@]} ~
done
(( ${#x[@]} >= 1 )) || continue
m lnf ${x[@]} ~
done
+ if $systemd_reload; then
+ m s systemctl daemon-reload
+ fi
}
user=$(id -un)
}
user=$(id -un)
@@
-136,6
+162,13
@@
case $user in
fi
m sudo -H -u user2 "${BASH_SOURCE[0]}"
fi
m sudo -H -u user2 "${BASH_SOURCE[0]}"
+
+ f=/a/bin/distro-setup/system-status
+ if [[ -x $f ]]; then
+ $f _
+ fi
+ echo 0 >~/.local/conflink
+
;;
user2)
m common-file-setup ${c_dirs[@]}
;;
user2)
m common-file-setup ${c_dirs[@]}
@@
-144,5
+177,3
@@
case $user in
echo "$0: error: unexpected user"; exit 1
;;
esac
echo "$0: error: unexpected user"; exit 1
;;
esac
-
-echo 0 >~/.local/conflink