Add check that only deploys if there is a new database
This commit is contained in:
parent
600c0b14cf
commit
065c10e5da
|
@ -9,4 +9,5 @@ else if processManager == "cygrunsrv" then "cygrunsrv-service"
|
||||||
else if processManager == "launchd" then "launchd-daemon"
|
else if processManager == "launchd" then "launchd-daemon"
|
||||||
else if processManager == "disnix" then "process"
|
else if processManager == "disnix" then "process"
|
||||||
else if processManager == "docker" then "docker-container"
|
else if processManager == "docker" then "docker-container"
|
||||||
|
else if processManager == "s6-rc" then "s6-rc-service"
|
||||||
else throw "Unknown process manager: ${processManager}"
|
else throw "Unknown process manager: ${processManager}"
|
||||||
|
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
sed -e "s|/bin/bash|$SHELL|" \
|
sed -e "s|/bin/bash|$SHELL|" \
|
||||||
-e "s|@getopt@|${getopt}/bin/getopt|" \
|
-e "s|@getopt@|${getopt}/bin/getopt|" \
|
||||||
-e "s|@readlink@|$(type -p readlink)|" \
|
-e "s|@readlink@|$(type -p readlink)|g" \
|
||||||
-e "s|@commonchecks@|${../commonchecks}|" \
|
-e "s|@commonchecks@|${../commonchecks}|" \
|
||||||
-e "s|@s6rcchecks@|${./s6-rc-checks}|" \
|
-e "s|@s6rcchecks@|${./s6-rc-checks}|" \
|
||||||
${./nixproc-s6-rc-deploy.in} > $out/bin/nixproc-s6-rc-deploy
|
${./nixproc-s6-rc-deploy.in} > $out/bin/nixproc-s6-rc-deploy
|
||||||
|
|
|
@ -127,8 +127,12 @@ fi
|
||||||
|
|
||||||
if [ -d "$liveDir" ]
|
if [ -d "$liveDir" ]
|
||||||
then
|
then
|
||||||
s6-rc-update -l $liveDir $compileDir/$compiledDatabaseName
|
# Only update when the database to be deployed is different
|
||||||
rm -rf $(@readlink@ -f $compileDir/compiled)
|
if [ ! -e "$compileDir/compiled" ] || [ "$(@readlink@ -f $compileDir/$compiledDatabaseName)" != "$(@readlink@ -f $compileDir/compiled)" ]
|
||||||
|
then
|
||||||
|
s6-rc-update -l $liveDir $compileDir/$compiledDatabaseName
|
||||||
|
rm -rf $(@readlink@ -f $compileDir/compiled)
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
s6-rc-init -c $compileDir/$compiledDatabaseName -l $liveDir $scanDir
|
s6-rc-init -c $compileDir/$compiledDatabaseName -l $liveDir $scanDir
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue