git.iko.soy/nix-bundle
on master help sign in
Merge pull request #67 from zimbatm/shellcheck
c5f2dfcMatthew Bauer
default.nix+15−1
compare with master
unifiedsplit
@@ -10,6 +10,16 @@ let
10 '';
10 '';
11 });
11 });
12in rec {
12in rec {
13+ toStorePath = target:
14+ # If a store path has been given, transform it to a string. And make sure
15+ # to capture the store path in its context.
16+ if lib.isStorePath target then
17+ let path = toString target; in
18+ builtins.appendContext path { "${path}" = { path = true; }; }
19+ # Otherwise, add to the store. This takes care of appending the store path
20+ # in the context automatically.
21+ else "${target}";
22+
13 arx = { archive, startup}:
23 arx = { archive, startup}:
14 stdenv.mkDerivation {
24 stdenv.mkDerivation {
15 name = "arx";
25 name = "arx";
@@ -71,9 +81,13 @@ in rec {
71 };
81 };
72
82
73 makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:
83 makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:
84+ let
85+ # Avoid re-adding a store path into the store
86+ path = toStorePath target;
87+ in
74 writeScript "startup" ''
88 writeScript "startup" ''
75 #!/bin/sh
89 #!/bin/sh
76− .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${target}${run} $@
90+ .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
77 '';
91 '';
78
92
79 nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "" }:
93 nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "" }:
nix-bootstrap.sh+13−13
@@ -1,35 +1,35 @@
1#!/bin/sh
1#!/bin/sh
2
2
3−cmd=sh
4−if ! [ $# -eq 0 ]; then
3+if [ $# -gt 0 ]; then
5− cmd=$@
4+ set -- sh
6fi
5fi
7
6
8# should download this in the future
7# should download this in the future
9# but the mirror is down
8# but the mirror is down
10−proot=`dirname $0`/proot-`uname -p`
9+proot=$(dirname "$0")/proot-$(uname -p)
11export PROOT_NO_SECCOMP=1
10export PROOT_NO_SECCOMP=1
12
11
13nixdir=$HOME/.nix
12nixdir=$HOME/.nix
14
13
15OLD_NIX_PATH=$NIX_PATH
14OLD_NIX_PATH=$NIX_PATH
15+# shellcheck disable=SC1090
16−if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc/profile.d/nix.sh; fi
16+if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then . "$HOME/.nix-profile/etc/profile.d/nix.sh"; fi
17−if ! [ -z "$OLD_NIX_PATH" ]; then NIX_PATH="$OLD_NIX_PATH"; fi
17+if [ -n "$OLD_NIX_PATH" ]; then NIX_PATH="$OLD_NIX_PATH"; fi
18
18
19if [ -z "$IN_PROOT" ]; then
19if [ -z "$IN_PROOT" ]; then
20 export IN_PROOT=1
20 export IN_PROOT=1
21
21
22− if ! [ -d $nixdir ]; then
22+ if ! [ -d "$nixdir" ]; then
23− mkdir -p $nixdir
23+ mkdir -p "$nixdir"
24 s=$(mktemp)
24 s=$(mktemp)
25− curl https://nixos.org/nix/install -o $s
25+ curl https://nixos.org/nix/install -o "$s"
26− $proot -b $nixdir:/nix $0 sh $s
26+ $proot -b "$nixdir:/nix" "$0" sh "$s"
27 fi
27 fi
28
28
29− $proot -b $nixdir:/nix $0 $cmd
29+ $proot -b "$nixdir:/nix" "$0" "$@"
30
30
31 export IN_PROOT=
31 export IN_PROOT=
32 exit
32 exit
33−elif ! [ $# -eq 0 ]; then
33+elif [ $# -gt 0 ]; then
34− exec $cmd
34+ exec "$@"
35fi
35fi
nix-bundle.sh+11−6
@@ -8,6 +8,9 @@ Usage: $0 TARGET EXECUTABLE
8Create a single-file bundle from the nixpkgs attribute "TARGET".
8Create a single-file bundle from the nixpkgs attribute "TARGET".
9EXECUTABLE should be relative to the TARGET's output path.
9EXECUTABLE should be relative to the TARGET's output path.
10
10
11+The TARGET is either an attribute in nixpkgs, or an absolute path to the
12+store.
13+
11For example:
14For example:
12
15
13$ $0 hello /bin/hello
16$ $0 hello /bin/hello
@@ -19,7 +22,7 @@ EOF
19 exit 1
22 exit 1
20fi
23fi
21
24
22−nix_file=`dirname $0`/default.nix
25+nix_file=$(dirname "$0")/default.nix
23
26
24target="$1"
27target="$1"
25shift
28shift
@@ -38,21 +41,23 @@ shift
38bootstrap=nix-bootstrap
41bootstrap=nix-bootstrap
39if [ "$target" = "nix-bundle" ] || [ "$target" = "nixStable" ] || [ "$target" = "nixUnstable" ] || [ "$target" = "nix" ]; then
42if [ "$target" = "nix-bundle" ] || [ "$target" = "nixStable" ] || [ "$target" = "nixUnstable" ] || [ "$target" = "nix" ]; then
40 bootstrap=nix-bootstrap-nix
43 bootstrap=nix-bootstrap-nix
41−elif ! [ -z "$extraTargets" ]; then
44+elif [ -n "$extraTargets" ]; then
42 bootstrap=nix-bootstrap-path
45 bootstrap=nix-bootstrap-path
43fi
46fi
44
47
45expr="with import <nixpkgs> {}; with import $nix_file {}; $bootstrap { target = $target; extraTargets = [ $extraTargets ]; run = \"$exec\"; }"
48expr="with import <nixpkgs> {}; with import $nix_file {}; $bootstrap { target = $target; extraTargets = [ $extraTargets ]; run = \"$exec\"; }"
46
49
47−out=$(nix-store --no-gc-warning -r $(nix-instantiate --no-gc-warning -E "$expr"))
50+drv=$(nix-instantiate --no-gc-warning -E "$expr")
51+
52+out=$(nix-store --no-gc-warning --realize "$drv")
48
53
49if [ -z "$out" ]; then
54if [ -z "$out" ]; then
50 >&2 echo "$0 failed. Exiting."
55 >&2 echo "$0 failed. Exiting."
51 exit 1
56 exit 1
52elif [ -t 1 ]; then
57elif [ -t 1 ]; then
53− filename=$(basename $exec)
58+ filename=$(basename "$exec")
54 echo "Nix bundle created at $filename."
59 echo "Nix bundle created at $filename."
55− cp -f $out $filename
60+ cp -f "$out" "$filename"
56else
61else
57− cat $out
62+ cat "$out"
58fi
63fi
nix-run.sh+10−10
@@ -22,7 +22,7 @@ pkg="$1"
22shift
22shift
23
23
24# A second argument will provide a hint to run
24# A second argument will provide a hint to run
25−if ! [ -z "$1" ]; then
25+if [ -n "$1" ]; then
26 name="$1"
26 name="$1"
27 shift
27 shift
28else
28else
@@ -53,11 +53,11 @@ run_linux_desktop_app () {
53 file="$1"
53 file="$1"
54 shift
54 shift
55
55
56− cmd=$(grep '^Exec' $file | tail -1 | \
56+ cmd=$(grep '^Exec' "$file" | tail -1 | \
57 sed 's/Exec=//;s/^"//;s/" *$//')
57 sed 's/Exec=//;s/^"//;s/" *$//')
58
58
59− if ! [ -z "$@" ]; then
59+ if [ "$#" -gt 0 ]; then
60− cmd=$(echo "$cmd" | sed "s/%[fu]/$1/;s/%[FU]/$@/")
60+ cmd=$(echo "$cmd" | sed "s/%[fu]/$1/;s/%[FU]/$*/")
61 fi
61 fi
62
62
63 cmd=$(echo "$cmd" | sed "s/%k/$desktop/;s/%.//")
63 cmd=$(echo "$cmd" | sed "s/%k/$desktop/;s/%.//")
@@ -79,20 +79,20 @@ elif [ -x "$out/bin/run" ]; then
79 run_bin "$out/bin/run" "$@"
79 run_bin "$out/bin/run" "$@"
80elif [ "$(uname)" = Darwin ] && [ -d "$out/Applications/$name.app" ]; then
80elif [ "$(uname)" = Darwin ] && [ -d "$out/Applications/$name.app" ]; then
81 run_darwin_app "$out/Applications/$name.app" "$@"
81 run_darwin_app "$out/Applications/$name.app" "$@"
82−elif [ "$(uname)" = Darwin ] && [ -d $out/Applications/*.app ]; then
82+elif [ "$(uname)" = Darwin ] && [ -d "$out"/Applications/*.app ]; then
83− for f in $out/Applications/*.app; do
83+ for f in "$out"/Applications/*.app; do
84 run_darwin_app "$f" "$@"
84 run_darwin_app "$f" "$@"
85 done
85 done
86elif [ -f "$out/share/applications/$name.desktop" ]; then
86elif [ -f "$out/share/applications/$name.desktop" ]; then
87− run_linux_desktop_app "$out/share/applications/$name.desktop" $@
87+ run_linux_desktop_app "$out/share/applications/$name.desktop" "$@"
88−elif [ -d $out/share/applications ]; then
88+elif [ -d "$out"/share/applications ]; then
89− for f in $out/share/applications/*.desktop; do
89+ for f in "$out"/share/applications/*.desktop; do
90 run_linux_desktop_app "$f"
90 run_linux_desktop_app "$f"
91 done
91 done
92elif [ -x "$out/bin/$name" ]; then
92elif [ -x "$out/bin/$name" ]; then
93 run_bin "$out/bin/$name" "$@"
93 run_bin "$out/bin/$name" "$@"
94elif [ -d "$out/bin" ]; then
94elif [ -d "$out/bin" ]; then
95− for bin in $out/bin/*; do
95+ for bin in "$out"/bin/*; do
96 run_bin "$bin" "$@"
96 run_bin "$bin" "$@"
97 done
97 done
98else
98else