nix: refactor tools to use --subst-var-by

Summary: Easier to understand and makes the "what" these scripts are doing much
more clear.

Signed-off-by: Austin Seipp <[email protected]>
Change-Id: I5d1c56564e742a473a2379d9af120efc

Author: thoughtpolice

flake.nix

@@ -217,36 +217,37 @@
           # Start a version of the server.
           start-server = pkgs.runCommand "start-postgres-server" {} ''
             mkdir -p $out/bin
-            substitute ${./tools/run-server.sh} $out/bin/start-postgres-server \
-              --replace 'PSQL14=' 'PSQL14=${basePackages.psql_14.bin} #' \
-              --replace 'PSQL15=' 'PSQL15=${basePackages.psql_15.bin} #'
+            substitute ${./tools/run-server.sh.in} $out/bin/start-postgres-server \
+              --subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
+              --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}'
             chmod +x $out/bin/start-postgres-server
           '';
 
           # Start a version of the client.
           start-client = pkgs.runCommand "start-postgres-client" {} ''
             mkdir -p $out/bin
-            substitute ${./tools/run-client.sh} $out/bin/start-postgres-client \
-              --replace 'PSQL14=' 'PSQL14=${basePackages.psql_14.bin} #'
+            substitute ${./tools/run-client.sh.in} $out/bin/start-postgres-client \
+              --subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
+              --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}'
             chmod +x $out/bin/start-postgres-client
           '';
 
           # Migrate between two data directories.
           migrate-tool =
             let
-              configFile = ./tests/postgresql.conf;
+              configFile = ./tests/postgresql.conf.in;
               getkeyScript = ./tests/util/pgsodium_getkey.sh;
               primingScript = ./tests/prime.sql;
               migrationData = ./tests/migrations/data.sql;
             in pkgs.runCommand "migrate-postgres" {} ''
               mkdir -p $out/bin
-              substitute ${./tools/migrate-tool.sh} $out/bin/migrate-postgres \
-                --replace 'PSQL14=' 'PSQL14=${basePackages.psql_14.bin} #' \
-                --replace 'PSQL15=' 'PSQL15=${basePackages.psql_15.bin} #' \
-                --replace 'PSQL_CONF_FILE=' 'PSQL_CONF_FILE=${configFile} #' \
-                --replace 'PGSODIUM_GETKEY_SCRIPT=' 'PGSODIUM_GETKEY_SCRIPT=${getkeyScript} #' \
-                --replace 'PRIMING_SCRIPT=' 'PRIMING_SCRIPT=${primingScript} #' \
-                --replace 'MIGRATION_DATA=' 'MIGRATION_DATA=${migrationData} #'
+              substitute ${./tools/migrate-tool.sh.in} $out/bin/migrate-postgres \
+                --subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
+                --subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
+                --subst-var-by 'PSQL_CONF_FILE' '${configFile}' \
+                --subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}' \
+                --subst-var-by 'PRIMING_SCRIPT' '${primingScript}' \
+                --subst-var-by 'MIGRATION_DATA' '${migrationData}'
 
               chmod +x $out/bin/migrate-postgres
             '';
@@ -264,7 +265,7 @@
             mkdir -p $PGDATA
             initdb --locale=C
 
-            substitute ${./tests/postgresql.conf} $PGDATA/postgresql.conf \
+            substitute ${./tests/postgresql.conf.in} $PGDATA/postgresql.conf \
               --subst-var-by PGSODIUM_GETKEY_SCRIPT "${./tests/util/pgsodium_getkey.sh}"
 
             postgres -k /tmp >logfile 2>&1 &

tests/postgresql.conf renamed to tests/postgresql.conf.in

@@ -10,10 +10,10 @@ if [[ $1 == /nix/store* ]]; then
     fi
     OLDVER="$1"
 elif [ "$1" == "14" ]; then
-    PSQL14=$(nix build --quiet --no-link --print-out-paths .#"psql_14/bin")
+    PSQL14=@PSQL14_BINDIR@
     OLDVER="$PSQL14"
 elif [ "$1" == "15" ]; then
-    PSQL15=$(nix build --quiet --no-link --print-out-paths .#"psql_15/bin")
+    PSQL15=@PSQL15_BINDIR@
     OLDVER="$PSQL15"
 else
     echo "Please provide a valid Postgres version (14 or 15), or a /nix/store path"
@@ -28,10 +28,10 @@ if [[ $2 == /nix/store* ]]; then
     fi
     NEWVER="$2"
 elif [ "$2" == "14" ]; then
-    PSQL14=$(nix build --quiet --no-link --print-out-paths .#"psql_14/bin")
+    PSQL14=@PSQL14_BINDIR@
     NEWVER="$PSQL14"
 elif [ "$2" == "15" ]; then
-    PSQL15=$(nix build --quiet --no-link --print-out-paths .#"psql_15/bin")
+    PSQL15=@PSQL15_BINDIR@
     NEWVER="$PSQL15"
 else
     echo "Please provide a valid Postgres version (14 or 15), or a /nix/store path"
@@ -62,8 +62,8 @@ $OLDVER/bin/initdb -D "$DATDIR" --locale=C
 $NEWVER/bin/initdb -D "$NEWDAT" --locale=C
 
 # NOTE (aseipp): we need to patch postgresql.conf to have the right pgsodium_getkey script
-PSQL_CONF_FILE=$PWD/tests/postgresql.conf
-PGSODIUM_GETKEY_SCRIPT=$PWD/tests/util/pgsodium_getkey.sh
+PSQL_CONF_FILE=@PSQL_CONF_FILE@
+PGSODIUM_GETKEY_SCRIPT=@PGSODIUM_GETKEY@
 echo "NOTE: patching postgresql.conf files"
 for x in "$DATDIR" "$NEWDAT"; do
   sed \
@@ -74,8 +74,8 @@ done
 echo "NOTE: Starting first server (v${1}) to load data into the system"
 $OLDVER/bin/pg_ctl start -D "$DATDIR"
 
-PRIMING_SCRIPT=$PWD/tests/prime.sql
-MIGRATION_DATA=$PWD/tests/migrations/data.sql
+PRIMING_SCRIPT=@PRIMING_SCRIPT@
+MIGRATION_DATA=@MIGRATION_DATA@
 
 $OLDVER/bin/psql -h localhost -d postgres -Xf "$PRIMING_SCRIPT"
 $OLDVER/bin/psql -h localhost -d postgres -Xf "$MIGRATION_DATA"

tools/migrate-tool.sh renamed to tools/migrate-tool.sh.in

@@ -6,11 +6,11 @@
 # first argument should be '14' or '15' for the version
 if [ "$1" == "14" ]; then
     echo "Starting server for PSQL 14"
-    PSQL14=$(nix build --quiet --no-link --print-out-paths .#"psql_14/bin")
+    PSQL14=@PSQL14_BINDIR@
     BINDIR="$PSQL14"
 elif [ "$1" == "15" ]; then
     echo "Starting server for PSQL 15"
-    PSQL15=$(nix build --quiet --no-link --print-out-paths .#"psql_15/bin")
+    PSQL15=@PSQL15_BINDIR@
     BINDIR="$PSQL15"
 else
     echo "Please provide a valid Postgres version (14 or 15)"

tools/run-client.sh renamed to tools/run-client.sh.in

@@ -6,11 +6,11 @@
 # first argument should be '14' or '15' for the version
 if [ "$1" == "14" ]; then
     echo "Starting server for PSQL 14"
-    PSQL14=$(nix build --quiet --no-link --print-out-paths .#"psql_14/bin")
+    PSQL14=@PSQL14_BINDIR@
     BINDIR="$PSQL14"
 elif [ "$1" == "15" ]; then
     echo "Starting server for PSQL 15"
-    PSQL15=$(nix build --quiet --no-link --print-out-paths .#"psql_15/bin")
+    PSQL15=@PSQL15_BINDIR@
     BINDIR="$PSQL15"
 else
     echo "Please provide a valid Postgres version (14 or 15)"