@@ -18,7 +18,7 @@ if [ -z "$1" ]; then
1818 exit 1
1919fi
2020
21−pkg=$1
21+pkg="$1"
2222shift
2323
2424# A second argument will provide a hint to run
@@ -31,7 +31,7 @@ fi
3131
3232expr="with import <nixpkgs> {}; let x = ($pkg); in x"
3333path=$(nix-instantiate --no-gc-warning -E "$expr")
34−out=$(nix-store --no-gc-warning -r $path)
34+out=$(nix-store --no-gc-warning -r "$path")
3535
3636if [ -z "$out" ]; then
3737 >&2 echo "Could not evaluate $pkg to a Nix drv."
@@ -43,7 +43,7 @@ run_darwin_app () {
4343 dir="$1"
4444 shift
4545
46− open -a "$dir" --args $@
46+ open -a "$dir" --args "$@"
4747}
4848
4949# Run FILE as a Freedesktop application
@@ -70,18 +70,18 @@ run_bin () {
7070 file="$1"
7171 shift
7272
73− $file $@
73+ "$file" "$@"
7474}
7575
7676if [ -x "$out/nix-support/run" ]; then
77− run_bin "$out/nix-support/run" $@
77+ run_bin "$out/nix-support/run" "$@"
7878elif [ -x "$out/bin/run" ]; then
79− run_bin "$out/bin/run" $@
79+ run_bin "$out/bin/run" "$@"
8080elif [ "$(uname)" = Darwin ] && [ -d "$out/Applications/$name.app" ]; then
81− run_darwin_app "$out/Applications/$name.app" $@
81+ run_darwin_app "$out/Applications/$name.app" "$@"
8282elif [ "$(uname)" = Darwin ] && [ -d $out/Applications/*.app ]; then
8383 for f in $out/Applications/*.app; do
84− run_darwin_app "$f" $@
84+ run_darwin_app "$f" "$@"
8585 done
8686elif [ -f "$out/share/applications/$name.desktop" ]; then
8787 run_linux_desktop_app "$out/share/applications/$name.desktop" $@
@@ -90,10 +90,10 @@ elif [ -d $out/share/applications ]; then
9090 run_linux_desktop_app "$f"
9191 done
9292elif [ -x "$out/bin/$name" ]; then
93− run_bin "$out/bin/$name" $@
93+ run_bin "$out/bin/$name" "$@"
9494elif [ -d "$out/bin" ]; then
9595 for bin in $out/bin/*; do
96− run_bin "$bin" $@
96+ run_bin "$bin" "$@"
9797 done
9898else
9999 >&2 echo "Cannot find a way to run path $out."