ilyakooo0/nix-bundle
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nix-bundle.git synced 2024-09-11 06:55:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Quote properly in nix-run.sh

Browse Source
This commit is contained in:
Matthew Bauer 2020-05-09 15:30:12 -05:00
parent bdd1a0fe79
commit 5ba831bd8d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nix-run.sh
View File

@ -18,7 +18,7 @@ if [ -z "$1" ]; then
exit 1 exit 1
fi fi
pkg=$1 pkg="$1"
shift shift
# A second argument will provide a hint to run # A second argument will provide a hint to run
@ -31,7 +31,7 @@ fi
expr="with import <nixpkgs> {}; let x = ($pkg); in x" expr="with import <nixpkgs> {}; let x = ($pkg); in x"
path=$(nix-instantiate --no-gc-warning -E "$expr") path=$(nix-instantiate --no-gc-warning -E "$expr")
out=$(nix-store --no-gc-warning -r $path) out=$(nix-store --no-gc-warning -r "$path")
if [ -z "$out" ]; then if [ -z "$out" ]; then
>&2 echo "Could not evaluate $pkg to a Nix drv." >&2 echo "Could not evaluate $pkg to a Nix drv."
@ -43,7 +43,7 @@ run_darwin_app () {
dir="$1" dir="$1"
shift shift
open -a "$dir" --args $@ open -a "$dir" --args "$@"
} }
# Run FILE as a Freedesktop application # Run FILE as a Freedesktop application
@ -70,18 +70,18 @@ run_bin () {
file="$1" file="$1"
shift shift
$file $@ "$file" "$@"
} }
if [ -x "$out/nix-support/run" ]; then if [ -x "$out/nix-support/run" ]; then
run_bin "$out/nix-support/run" $@ run_bin "$out/nix-support/run" "$@"
elif [ -x "$out/bin/run" ]; then elif [ -x "$out/bin/run" ]; then
run_bin "$out/bin/run" $@ run_bin "$out/bin/run" "$@"
elif [ "$(uname)" = Darwin ] && [ -d "$out/Applications/$name.app" ]; then elif [ "$(uname)" = Darwin ] && [ -d "$out/Applications/$name.app" ]; then
run_darwin_app "$out/Applications/$name.app" $@ run_darwin_app "$out/Applications/$name.app" "$@"
elif [ "$(uname)" = Darwin ] && [ -d $out/Applications/*.app ]; then elif [ "$(uname)" = Darwin ] && [ -d $out/Applications/*.app ]; then
for f in $out/Applications/*.app; do for f in $out/Applications/*.app; do
run_darwin_app "$f" $@ run_darwin_app "$f" "$@"
done done
elif [ -f "$out/share/applications/$name.desktop" ]; then elif [ -f "$out/share/applications/$name.desktop" ]; then
run_linux_desktop_app "$out/share/applications/$name.desktop" $@ run_linux_desktop_app "$out/share/applications/$name.desktop" $@
@ -90,10 +90,10 @@ elif [ -d $out/share/applications ]; then
run_linux_desktop_app "$f" run_linux_desktop_app "$f"
done done
elif [ -x "$out/bin/$name" ]; then elif [ -x "$out/bin/$name" ]; then
run_bin "$out/bin/$name" $@ run_bin "$out/bin/$name" "$@"
elif [ -d "$out/bin" ]; then elif [ -d "$out/bin" ]; then
for bin in $out/bin/*; do for bin in $out/bin/*; do
run_bin "$bin" $@ run_bin "$bin" "$@"
done done
else else
>&2 echo "Cannot find a way to run path $out." >&2 echo "Cannot find a way to run path $out."