Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell: split init.proxy off from init.env

Browse Source
This commit is contained in:
tv 2017-07-23 21:36:41 +02:00
parent 6fc6456ed9
commit 04d4ea7d68
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
shell.nix
View File

@ -15,6 +15,7 @@ let
\test -n "''${target-}" || target=$system \test -n "''${target-}" || target=$system
\test -n "''${user-}" || user=$LOGNAME \test -n "''${user-}" || user=$LOGNAME
. ${init.env} . ${init.env}
. ${init.proxy}
exec ${utils.deploy} exec ${utils.deploy}
''; '';
@ -29,6 +30,7 @@ let
. ${init.args} . ${init.args}
\test -n "''${user-}" || user=$LOGNAME \test -n "''${user-}" || user=$LOGNAME
. ${init.env} . ${init.env}
. ${init.proxy}
exec ${utils.build} config.system.build.toplevel exec ${utils.build} config.system.build.toplevel
''; '';
@ -114,9 +116,6 @@ let
''; '';
init.env = pkgs.writeText "init.env" /* sh */ '' init.env = pkgs.writeText "init.env" /* sh */ ''
source=''${source-$user/1systems/$system/source.nix}
export source
export system export system
export target export target
export user export user
@ -129,38 +128,31 @@ let
export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)" export target_port="$(echo $target_object | ${pkgs.jq}/bin/jq -r .port)"
export target_path="$(echo $target_object | ${pkgs.jq}/bin/jq -r .path)" export target_path="$(echo $target_object | ${pkgs.jq}/bin/jq -r .path)"
export target_local="$(echo $target_object | ${pkgs.jq}/bin/jq -r .local)" export target_local="$(echo $target_object | ${pkgs.jq}/bin/jq -r .local)"
'';
init.proxy = pkgs.writeText "init.proxy" /* sh */ ''
if \test "''${using_proxy-}" != true; then if \test "''${using_proxy-}" != true; then
${init.env.populate}
source_file=$user/1systems/$system/source.nix
source=$(get-source "$source_file")
qualified_target=$target_user@$target_host:$target_port$target_path
echo "$source" | populate "$qualified_target"
if \test "$target_local" != true; then if \test "$target_local" != true; then
exec ${init.env.proxy} "$command" "$@" exec ${pkgs.openssh}/bin/ssh \
"$target_user@$target_host" -p "$target_port" \
cd "$target_path/stockholm" \; \
NIX_PATH=$(quote "$target_path") \
STOCKHOLM_VERSION=$(quote "$STOCKHOLM_VERSION") \
nix-shell --run "$(quote "
system=$(quote "$system") \
target=$(quote "$target") \
using_proxy=true \
$(quote "$command" "$@")
")"
fi fi
fi fi
'' // { '';
populate = pkgs.writeDash "init.env.populate" ''
set -efu
_source=$(get-source "$source")
echo $_source |
${pkgs.populate}/bin/populate \
"$target_user@$target_host:$target_port$target_path" \
>&2
unset _source
'';
proxy = pkgs.writeDash "init.env.proxy" ''
set -efu
exec ${pkgs.openssh}/bin/ssh \
"$target_user@$target_host" -p "$target_port" \
cd "$target_path/stockholm" \; \
NIX_PATH=$(quote "$target_path") \
STOCKHOLM_VERSION=$(quote "$STOCKHOLM_VERSION") \
nix-shell --run "$(quote "
system=$(quote "$system") \
target=$(quote "$target") \
using_proxy=true \
$(quote "$@")
")"
'';
};
utils.build = pkgs.writeDash "utils.build" '' utils.build = pkgs.writeDash "utils.build" ''
set -efu set -efu
@ -204,6 +196,7 @@ in pkgs.stdenv.mkDerivation {
export NIX_PATH=stockholm=$PWD:nixpkgs=${toString <nixpkgs>} export NIX_PATH=stockholm=$PWD:nixpkgs=${toString <nixpkgs>}
export NIX_REMOTE=daemon export NIX_REMOTE=daemon
export PATH=${lib.makeBinPath [ export PATH=${lib.makeBinPath [
pkgs.populate
shell.cmdspkg shell.cmdspkg
]} ]}