|
|
|
@ -22,7 +22,7 @@ repair= |
|
|
|
|
profile=/nix/var/nix/profiles/system |
|
|
|
|
buildHost= |
|
|
|
|
targetHost= |
|
|
|
|
maybeSudo= |
|
|
|
|
maybeSudo=() |
|
|
|
|
|
|
|
|
|
while [ "$#" -gt 0 ]; do |
|
|
|
|
i="$1"; shift 1 |
|
|
|
@ -92,7 +92,7 @@ while [ "$#" -gt 0 ]; do |
|
|
|
|
;; |
|
|
|
|
--use-remote-sudo) |
|
|
|
|
# note the trailing space |
|
|
|
|
maybeSudo="sudo " |
|
|
|
|
maybeSudo=(sudo --) |
|
|
|
|
shift 1 |
|
|
|
|
;; |
|
|
|
|
*) |
|
|
|
@ -102,6 +102,10 @@ while [ "$#" -gt 0 ]; do |
|
|
|
|
esac |
|
|
|
|
done |
|
|
|
|
|
|
|
|
|
if [ -n "$SUDO_USER" ]; then |
|
|
|
|
maybeSudo=(sudo --) |
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
if [ -z "$buildHost" -a -n "$targetHost" ]; then |
|
|
|
|
buildHost="$targetHost" |
|
|
|
|
fi |
|
|
|
@ -116,17 +120,17 @@ buildHostCmd() { |
|
|
|
|
if [ -z "$buildHost" ]; then |
|
|
|
|
"$@" |
|
|
|
|
elif [ -n "$remoteNix" ]; then |
|
|
|
|
ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "$maybeSudo$@" |
|
|
|
|
ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "${maybeSudo[@]}" "$@" |
|
|
|
|
else |
|
|
|
|
ssh $SSHOPTS "$buildHost" "$maybeSudo$@" |
|
|
|
|
ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" |
|
|
|
|
fi |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
targetHostCmd() { |
|
|
|
|
if [ -z "$targetHost" ]; then |
|
|
|
|
"$@" |
|
|
|
|
"${maybeSudo[@]}" "$@" |
|
|
|
|
else |
|
|
|
|
ssh $SSHOPTS "$targetHost" "$maybeSudo$@" |
|
|
|
|
ssh $SSHOPTS "$targetHost" "${maybeSudo[@]}" "$@" |
|
|
|
|
fi |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|