/bin/sh -> ${stdenv.shell}

authored by rht and committed by Michael Raskin 5628cebc 83129a6e

+6 -5
+1 -1
pkgs/build-support/docker/default.nix
··· 82 export PATH=${shadow}/bin:$PATH 83 mkdir -p /etc/pam.d 84 if [[ ! -f /etc/passwd ]]; then 85 - echo "root:x:0:0::/root:/bin/sh" > /etc/passwd 86 echo "root:!x:::::::" > /etc/shadow 87 fi 88 if [[ ! -f /etc/group ]]; then
··· 82 export PATH=${shadow}/bin:$PATH 83 mkdir -p /etc/pam.d 84 if [[ ! -f /etc/passwd ]]; then 85 + echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd 86 echo "root:!x:::::::" > /etc/shadow 87 fi 88 if [[ ! -f /etc/group ]]; then
+1 -1
pkgs/build-support/release/ant-build.nix
··· 69 70 mkdir -p $out/bin 71 cat >> $out/bin/${w.name} <<EOF 72 - #! /bin/sh 73 export JAVA_HOME=$jre 74 $jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@ 75 EOF
··· 69 70 mkdir -p $out/bin 71 cat >> $out/bin/${w.name} <<EOF 72 + #!${stdenv.shell} 73 export JAVA_HOME=$jre 74 $jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@ 75 EOF
+1
pkgs/build-support/vm/windows/default.nix
··· 1 pkgs: 2 3 let
··· 1 + #note: the hardcoded /bin/sh is required for the VM's cygwin shell 2 pkgs: 3 4 let
+1 -1
pkgs/servers/nosql/eventstore/default.nix
··· 27 mkdir -p $out/{bin,lib/eventstore/clusternode} 28 cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ 29 cat > $out/bin/clusternode << EOF 30 - #!/bin/sh 31 exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" 32 EOF 33 chmod +x $out/bin/clusternode
··· 27 mkdir -p $out/{bin,lib/eventstore/clusternode} 28 cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ 29 cat > $out/bin/clusternode << EOF 30 + #!${stdenv.shell} 31 exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" 32 EOF 33 chmod +x $out/bin/clusternode
+1 -1
pkgs/servers/xmpp/pyIRCt/default.nix
··· 26 sed -e '/configFiles/iimport os' -i config.py 27 cp * $out/share/${name} 28 cat > $out/bin/pyIRCt <<EOF 29 - #! /bin/sh 30 cd $out/share/${name} 31 ./irc.py \"$@\" 32 EOF
··· 26 sed -e '/configFiles/iimport os' -i config.py 27 cp * $out/share/${name} 28 cat > $out/bin/pyIRCt <<EOF 29 + #!${stdenv.shell} 30 cd $out/share/${name} 31 ./irc.py \"$@\" 32 EOF
+1 -1
pkgs/servers/xmpp/pyMAILt/default.nix
··· 24 sed -e '/configFiles/iimport os' -i config.py 25 cp * $out/share/$name 26 cat > $out/bin/pyMAILt <<EOF 27 - #! /bin/sh 28 cd $out/share/${name} 29 ./mail.py \"$@\" 30 EOF
··· 24 sed -e '/configFiles/iimport os' -i config.py 25 cp * $out/share/$name 26 cat > $out/bin/pyMAILt <<EOF 27 + #!${stdenv.shell} 28 cd $out/share/${name} 29 ./mail.py \"$@\" 30 EOF