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

rht 5628cebc 83129a6e

Changed files
+6 -5
pkgs
build-support
docker
release
vm
windows
servers
nosql
eventstore
xmpp
pyIRCt
pyMAILt
+1 -1
pkgs/build-support/docker/default.nix
···
export PATH=${shadow}/bin:$PATH
mkdir -p /etc/pam.d
if [[ ! -f /etc/passwd ]]; then
-
echo "root:x:0:0::/root:/bin/sh" > /etc/passwd
echo "root:!x:::::::" > /etc/shadow
fi
if [[ ! -f /etc/group ]]; then
···
export PATH=${shadow}/bin:$PATH
mkdir -p /etc/pam.d
if [[ ! -f /etc/passwd ]]; then
+
echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd
echo "root:!x:::::::" > /etc/shadow
fi
if [[ ! -f /etc/group ]]; then
+1 -1
pkgs/build-support/release/ant-build.nix
···
mkdir -p $out/bin
cat >> $out/bin/${w.name} <<EOF
-
#! /bin/sh
export JAVA_HOME=$jre
$jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@
EOF
···
mkdir -p $out/bin
cat >> $out/bin/${w.name} <<EOF
+
#!${stdenv.shell}
export JAVA_HOME=$jre
$jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@
EOF
+1
pkgs/build-support/vm/windows/default.nix
···
pkgs:
let
···
+
#note: the hardcoded /bin/sh is required for the VM's cygwin shell
pkgs:
let
+1 -1
pkgs/servers/nosql/eventstore/default.nix
···
mkdir -p $out/{bin,lib/eventstore/clusternode}
cp -r bin/clusternode/* $out/lib/eventstore/clusternode/
cat > $out/bin/clusternode << EOF
-
#!/bin/sh
exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@"
EOF
chmod +x $out/bin/clusternode
···
mkdir -p $out/{bin,lib/eventstore/clusternode}
cp -r bin/clusternode/* $out/lib/eventstore/clusternode/
cat > $out/bin/clusternode << EOF
+
#!${stdenv.shell}
exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@"
EOF
chmod +x $out/bin/clusternode
+1 -1
pkgs/servers/xmpp/pyIRCt/default.nix
···
sed -e '/configFiles/iimport os' -i config.py
cp * $out/share/${name}
cat > $out/bin/pyIRCt <<EOF
-
#! /bin/sh
cd $out/share/${name}
./irc.py \"$@\"
EOF
···
sed -e '/configFiles/iimport os' -i config.py
cp * $out/share/${name}
cat > $out/bin/pyIRCt <<EOF
+
#!${stdenv.shell}
cd $out/share/${name}
./irc.py \"$@\"
EOF
+1 -1
pkgs/servers/xmpp/pyMAILt/default.nix
···
sed -e '/configFiles/iimport os' -i config.py
cp * $out/share/$name
cat > $out/bin/pyMAILt <<EOF
-
#! /bin/sh
cd $out/share/${name}
./mail.py \"$@\"
EOF
···
sed -e '/configFiles/iimport os' -i config.py
cp * $out/share/$name
cat > $out/bin/pyMAILt <<EOF
+
#!${stdenv.shell}
cd $out/share/${name}
./mail.py \"$@\"
EOF