summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-06-30 04:56:21 +0200
committertv <tv@krebsco.de>2017-06-30 04:56:21 +0200
commita2ea8740a40d5e9f5dc8e86d33e605a78963fc2f (patch)
treed4618d8af487fb7ca884c1f3de1ce1a7075e3f3f
parentdbe4cc21e33ccc22b9dd352dd8c6913d60a0cbc0 (diff)
shell: use writeDash
-rw-r--r--shell.nix24
1 files changed, 8 insertions, 16 deletions
diff --git a/shell.nix b/shell.nix
index 302429a4c..d6d215861 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,8 +4,7 @@
slib = import ./lib;
# usage: deploy system=SYSTEM [target=TARGET]
- cmds.deploy = pkgs.writeScript "cmds.deploy" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ cmds.deploy = pkgs.writeDash "cmds.deploy" ''
set -efu
command=deploy
@@ -17,8 +16,7 @@
'';
# usage: test system=SYSTEM target=TARGET
- cmds.test = pkgs.writeScript "cmds.test" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ cmds.test = pkgs.writeDash "cmds.test" /* sh */ ''
set -efu
command=test
@@ -65,8 +63,7 @@
fi
fi
'' // {
- parsetarget = pkgs.writeScript "init.env.parsetarget" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ parsetarget = pkgs.writeDash "init.env.parsetarget" ''
set -efu
exec ${pkgs.jq}/bin/jq \
-enr \
@@ -86,8 +83,7 @@
}
'';
};
- populate = pkgs.writeScript "init.env.populate" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ populate = pkgs.writeDash "init.env.populate" ''
set -efu
${pkgs.nix}/bin/nix-instantiate \
--eval \
@@ -102,8 +98,7 @@
"$target_user@$target_host:$target_port$target_path" \
>&2
'';
- proxy = pkgs.writeScript "init.env.proxy" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ proxy = pkgs.writeDash "init.env.proxy" ''
set -efu
q() {
${pkgs.jq}/bin/jq -nr --arg x "$*" '$x | @sh "\(.)"'
@@ -124,8 +119,7 @@
'';
};
- utils.build = pkgs.writeScript "utils.build" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ utils.build = pkgs.writeDash "utils.build" ''
set -efu
expr=$1
shift
@@ -140,8 +134,7 @@
${pkgs.whatsupnix}/bin/whatsupnix
'';
- utils.deploy = pkgs.writeScript "utils.deploy" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ utils.deploy = pkgs.writeDash "utils.deploy" ''
set -efu
PATH=/run/current-system/sw/bin nixos-rebuild \
switch \
@@ -153,8 +146,7 @@
${pkgs.whatsupnix}/bin/whatsupnix
'';
- hook.get-version = pkgs.writeScript "hook.get-version" /* sh */ ''
- #! ${pkgs.dash}/bin/dash
+ hook.get-version = pkgs.writeDash "hook.get-version" ''
set -efu
version=git.$(${pkgs.git}/bin/git describe --always --dirty)
case $version in (*-dirty)