3 files changed, 30 insertions, 21 deletions
diff --git a/build-aux/ci/ci-build.sh b/build-aux/ci/ci-build.sh
index 93c9ee1..b7a4c38 100755
--- a/build-aux/ci/ci-build.sh
+++ b/build-aux/ci/ci-build.sh
@@ -35,10 +35,19 @@ EOF
   git config --global user.email git@euandre.org
   git config --global user.name 'EuAndreh CI'
 
+  if [ -f build-aux/with-container.sh ]; then
+    RUNNER='./build-aux/with-container.sh'
+  else
+    RUNNER='sh -c'
+  fi
+
   if [ -f ./bootstrap ]; then
-    ./build-aux/with-container.sh './bootstrap && ./configure --enable-programmer-mode --enable-ci-mode && make clean all check distcheck public'
+    COMMAND='./bootstrap && ./configure --enable-programmer-mode --enable-ci-mode && make clean all check distcheck public'
   else
-    ./build-aux/with-container.sh 'make clean check public'
+    COMMAND='make clean check public'
   fi
+
+  $RUNNER "$COMMAND"
+
   rsync -avzzP public/ "/srv/http/$PACKAGE/" --delete
 } | tee "$LOGFILE" 2>&1
diff --git a/build-aux/ci/git-pre-push.sh b/build-aux/ci/git-pre-push.sh
new file mode 100755
index 0000000..2d2bcb1
--- /dev/null
+++ b/build-aux/ci/git-pre-push.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -eux
+
+PACKAGE="$(basename "$PWD")"
+LOGS_DIR="/data/ci/$PACKAGE/logs"
+REMOTE_GIT_DIR="/data/git/$PACKAGE.git"
+
+DESCRIPTION="$(mktemp)"
+if [ -f description ]
+then
+  cp description "$DESCRIPTION"
+else
+  git config euandreh.description > "$DESCRIPTION"
+fi
+
+scp "$DESCRIPTION" "git.euandreh.xyz:$REMOTE_GIT_DIR/description"
+ssh git.euandreh.xyz mkdir -p "$LOGS_DIR"
+scp build-aux/ci/ci-build.sh         "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
+scp build-aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
diff --git a/build-aux/ci/git-pre-push.sh.in b/build-aux/ci/git-pre-push.sh.in
deleted file mode 100644
index 16428d6..0000000
--- a/build-aux/ci/git-pre-push.sh.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -eux
-
-PACKAGE="$(basename "$PWD")"
-LOGS_DIR="/data/ci/$PACKAGE/logs"
-REMOTE_GIT_DIR="/data/git/$PACKAGE.git"
-
-DESCRIPTION="$(mktemp)"
-if [ -f description ]
-then
-  cp description "$DESCRIPTION"
-else
-  git config euandreh.description > "$DESCRIPTION"
-fi
-
-scp "$DESCRIPTION" "git.@TLD@:$REMOTE_GIT_DIR/description"
-ssh git.@TLD@ mkdir -p "$LOGS_DIR"
-scp build-aux/ci/ci-build.sh         "git.@TLD@:$(dirname "$LOGS_DIR")/ci-build.sh"
-scp build-aux/ci/git-post-receive.sh "git.@TLD@:$REMOTE_GIT_DIR/hooks/post-receive"