iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conflink bug fix, btrbk on x3
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 42c811a6437f16b9e195b1fded71eb3516826efe..fdd3bd6072e07c25d802e132f0a828abb9605230 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-140,6
+140,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[@]}
@@
-149,8
+156,3
@@
case $user in
;;
esac
;;
esac
-f=/a/bin/distro-setup/system-status
-if [[ -x $f ]]; then
- $f _
-fi
-echo 0 >~/.local/conflink