diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-14 00:41:36 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-14 00:41:36 +0200 |
| commit | 8d128c769aec24d8989db8220d680ea6f4735193 (patch) | |
| tree | 8c8a6132fda88ba989bbb7fc170b54b1ca242987 /shell.nix | |
| parent | c4627764062a42f8d952ff90557c1e0d8735485f (diff) | |
| parent | 58380c82848c3db0bd6c3d74904153f3464c2098 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'shell.nix')
| -rw-r--r-- | shell.nix | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -2,24 +2,26 @@ let lib = import ./lib; pkgs = import <nixpkgs> { overlays = [(import ./krebs/5pkgs)]; }; - # usage: deploy --system=SYSTEM [--target=TARGET] + # usage: deploy [--user=USER] --system=SYSTEM [--target=TARGET] cmds.deploy = pkgs.writeDash "cmds.deploy" '' set -efu command=deploy . ${init.args} \test -n "''${target-}" || target=$system + \test -n "''${user-}" || user=$LOGNAME . ${init.env} exec ${utils.deploy} ''; - # usage: test --system=SYSTEM --target=TARGET + # usage: test [--user=USER] --system=SYSTEM --target=TARGET cmds.test = pkgs.writeDash "cmds.test" /* sh */ '' set -efu command=test . ${init.args} + \test -n "''${user-}" || user=$LOGNAME . ${init.env} export dummy_secrets=true @@ -28,14 +30,15 @@ let init.args = pkgs.writeText "init.args" /* sh */ '' args=$(${pkgs.utillinux}/bin/getopt -n "$command" -s sh \ - -o s:t: \ - -l system:,target: \ + -o s:t:u: \ + -l system:,target:,user: \ -- "$@") if \test $? != 0; then exit 1; fi eval set -- "$args" while :; do case $1 in -s|--system) system=$2; shift 2;; -t|--target) target=$2; shift 2;; + -u|--user) user=$2; shift 2;; --) shift; break;; esac; done for arg; do echo "$command: bad argument: $arg" >&2; done @@ -43,13 +46,14 @@ let ''; init.env = pkgs.writeText "init.env" /* sh */ '' - config=''${config-$LOGNAME/1systems/$system/config.nix} - source=''${source-$LOGNAME/1systems/$system/source.nix} + config=''${config-$user/1systems/$system/config.nix} + source=''${source-$user/1systems/$system/source.nix} export config export source export system export target + export user export target_object="$(${init.env.parsetarget} $target)" export target_user="$(echo $target_object | ${pkgs.jq}/bin/jq -r .user)" |