diff --git a/install/install.sh b/install/install.sh index d38fa2a7e..778129f49 100644 --- a/install/install.sh +++ b/install/install.sh @@ -22,8 +22,6 @@ echo "// File created by Hydro install script\n" >/tmp/install.js cat >/tmp/install.b64 << EOF123 %PLACEHOLDER% EOF123 -cat /tmp/install.b64 | base64 -d >>/tmp/install.js.gz -rm /tmp/install.b64 -gunzip /tmp/install.js.gz +cat /tmp/install.b64 | base64 -d | gunzip >/tmp/install.js node /tmp/install.js "$@" set +e diff --git a/install/install.ts b/install/install.ts index c6d06b317..c8ae7dfe5 100644 --- a/install/install.ts +++ b/install/install.ts @@ -422,7 +422,7 @@ ${nixConfBase}`); }, { init: 'install.caddy', - skip: () => !exec('caddy version').code || installAsJudge || noCaddy || !existsSync(`${process.env.HOME}/.hydro/Caddyfile`), + skip: () => installAsJudge || noCaddy || existsSync(`${process.env.HOME}/.hydro/Caddyfile`), hidden: installAsJudge, operations: [ 'nix-env -iA nixpkgs.caddy',