Change "src/infrastructure/ => src/" everywhere

5 files changed, 15 insertions, 15 deletions

diff --git a/src/ci/git-pre-receive.sh b/src/ci/git-pre-receive.sh
index 8cd83ee..051aec5 100755
--- a/src/ci/git-pre-receive.sh
+++ b/src/ci/git-pre-receive.sh
@@ -9,6 +9,6 @@ if [ "$SHA" = '0000000000000000000000000000000000000000' ]; then
 fi
 
 printf 'Upgrading post-receive hook...' >&2
-git show "$SHA":src/infrastructure/ci/git-post-receive.sh > hooks/post-receive
+git show "$SHA":src/ci/git-post-receive.sh > hooks/post-receive
 chmod +x hooks/post-receive
 printf 'done.\n' >&2
diff --git a/src/keys/gpg-import.sh b/src/keys/gpg-import.sh
index 63d2347..20317bf 100755
--- a/src/keys/gpg-import.sh
+++ b/src/keys/gpg-import.sh
@@ -17,8 +17,8 @@ help() {
 		  -h, --help    show this message
 
 
-		Import GPG keys under src/infrastructure/keys/GPG/ and mark them as
-		trusted, so that they can be used as recipients for encryption.
+		Import GPG keys under src/keys/GPG/ and mark them as trusted, so
+		that they can be used as recipients for encryption.
 
 
 		Examples:
@@ -61,9 +61,9 @@ done
 shift $((OPTIND - 1))
 
 
-gpg --import src/infrastructure/keys/GPG/*
+gpg --import src/keys/GPG/*
 
-gpg --with-colons --show-key src/infrastructure/keys/GPG/* |
+gpg --with-colons --show-key src/keys/GPG/* |
 	awk -F: '$1 == "fpr" { print $10 }' |
 	while read -r fpr; do
 		printf '5\ny\n' |
diff --git a/src/keys/gpg-recipients.sh b/src/keys/gpg-recipients.sh
index ad6e522..b2951b7 100755
--- a/src/keys/gpg-recipients.sh
+++ b/src/keys/gpg-recipients.sh
@@ -17,8 +17,8 @@ help() {
 		  -h, --help    show this message
 
 
-		Process GPG keys under src/infrastructure/keys/GPG/, and emit
-		the command-line flags to be given to the `gpg` command, as in:
+		Process GPG keys under src/keys/GPG/, and emit the command-line
+		flags to be given to the `gpg` command, as in:
 
 		  $ gpg -r KEY1 -r KEY2 ...
 
@@ -67,5 +67,5 @@ done
 shift $((OPTIND - 1))
 
 
-gpg --with-colons --show-key src/infrastructure/keys/GPG/* |
+gpg --with-colons --show-key src/keys/GPG/* |
 	awk -F: '$1 == "fpr" { printf " -r %s", $10 }'
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