diff options
Diffstat (limited to 'src/scripts')
| -rwxr-xr-x | src/scripts/reconfigure.sh | 10 | ||||
| -rwxr-xr-x | src/scripts/report.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/scripts/reconfigure.sh b/src/scripts/reconfigure.sh index 8fa47c5..08585b3 100755 --- a/src/scripts/reconfigure.sh +++ b/src/scripts/reconfigure.sh @@ -121,14 +121,14 @@ sudo -u deployer --preserve-env=GIT_CONFIG_GLOBAL git checkout "$SHA" guix system describe if [ "$DRY_RUN" = true ]; then - sudo -i guix system -c$NPROC -v3 build "$PWD"/src/infrastructure/guix/system.scm + sudo -i guix system -c$NPROC -v3 build "$PWD"/src/guix/system.scm else # COMMENT: pre-receive is always running the previous version! # The same is true for the reconfigure script itself. - cp description "$REPO"/description - cp src/infrastructure/ci/git-pre-receive.sh "$REPO"/hooks/pre-receive - cp src/infrastructure/guix/channels.scm /etc/guix/ - cp src/infrastructure/guix/system.scm /etc/guix/ + cp description "$REPO"/description + cp src/ci/git-pre-receive.sh "$REPO"/hooks/pre-receive + cp src/guix/channels.scm /etc/guix/ + cp src/guix/system.scm /etc/guix/ sudo -i guix system -c$NPROC -v3 reconfigure /etc/guix/system.scm diff --git a/src/scripts/report.sh b/src/scripts/report.sh index e14e40a..d9f0786 100755 --- a/src/scripts/report.sh +++ b/src/scripts/report.sh @@ -119,8 +119,8 @@ if [ -z "${OUTDIR:-}" ]; then exit 2 fi -if [ -r src/infrastructure/config/conf.env ]; then - CONF=src/infrastructure/config/conf.env +if [ -r src/config/conf.env ]; then + CONF=src/config/conf.env else CONF=/etc/conf.env fi |