writeScript* -> writeShellScript*

This commit is contained in:
Charlotte Van Petegem 2020-10-16 10:14:34 +02:00
parent 10d39faff4
commit 23b7c3f5a7
No known key found for this signature in database
GPG key ID: 019E764B7184435A
9 changed files with 12 additions and 38 deletions

View file

@ -35,15 +35,11 @@ let
runScript = "bash -c '''''${run}'''";
}).env
'';
gradle-run-script = pkgs.writeScriptBin "gradle" ''
#!${pkgs.bash}/bin/bash
gradle-run-script = pkgs.writeShellScriptBin "gradle" ''
REPO_ROOT="$(git rev-parse --show-toplevel)"
nix-shell --argstr run "\"$REPO_ROOT/gradlew $@\"" "${gradle-fhs-nix}"
'';
sign-release = pkgs.writeScriptBin "sign-release" ''
#!${pkgs.bash}/bin/bash
sign-release = pkgs.writeShellScriptBin "sign-release" ''
BUILD_TOOLS_PATH="${composed.androidsdk}/libexec/android-sdk/build-tools/${buildToolsVersion}"
REPO_ROOT="$(git rev-parse --show-toplevel)"
APK_DIR="$REPO_ROOT/app/build/outputs/apk/release"

View file

@ -9,9 +9,7 @@ pkgs.mkShell {
taglib
zlib
(
pkgs.writeScriptBin "start-db" ''
#!/${pkgs.bash}/bin/bash
pkgs.writeShellScriptBin "start-db" ''
trap "systemd-run --user --no-block docker stop accentor-db" 0
docker run -d --name accentor-db -p 5432:5432 --rm -v accentor-db-data:/var/lib/postgresql/data -e POSTGRES_PASSWORD=accentor postgres:latest

View file

@ -10,9 +10,7 @@ pkgs.mkShell {
yarn
zlib
(
pkgs.writeScriptBin "start-dockers" ''
#!${bash}/bin/bash
pkgs.writeShellScriptBin "start-dockers" ''
trap "systemd-run --user --no-block docker stop dodona-db dodona-cache" 0
docker run -d --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest

View file

@ -5,9 +5,7 @@ in
pkgs.mkShell {
buildInputs = with pkgs; [
(
pkgs.writeScriptBin "java" ''
#!${pkgs.zsh}/bin/zsh
pkgs.writeShellScriptBin "java" ''
old_path="$(patchelf --print-rpath ${jdk11}/bin/java)"
LD_LIBRARY_PATH="$old_path:${extraRpath}" ${jdk11}/bin/java $@
''