From 5984dbcdd90387e841051e9b41f2638929d2300c Mon Sep 17 00:00:00 2001
From: Marcel Kapfer <opensource@mmk2410.org>
Date: Tue, 15 Feb 2022 19:52:16 +0100
Subject: [PATCH] CI: Fix emacs directory path

---
 .gitlab-ci.yml     | 1 -
 publish/publish.el | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8487079..aef1d1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,6 @@ build:
   image: silex/emacs:27.2-alpine-ci
   stage: build
   script:
-    - mv dot-emacs .emacs.d
     - emacs -Q --script publish/publish.el
     - apk add --no-cache rsync
     - rsync --archive --verbose --chown=gitlab-ci:www-data --delete --progress -e"ssh -p "$SSH_PORT"" public/ "$SSH_USER"@mmk2410.org:/var/www/config.mmk2410.org/
diff --git a/publish/publish.el b/publish/publish.el
index 8a1da95..004ea44 100644
--- a/publish/publish.el
+++ b/publish/publish.el
@@ -22,7 +22,7 @@
 (add-to-list 'package-archives '("nongnu" . "https://elpa.nongnu.org/nongnu/") t)
 (package-refresh-contents)
 (package-install 'htmlize)
-(add-to-list 'load-path "~/.emacs.d/elpa")
+(add-to-list 'load-path "./elpa")
 
 (require 'org)
 (require 'ox-publish)
@@ -32,7 +32,7 @@
 
 (setq org-publish-project-alist
       `(("dot-emacs:org"
-         :base-directory "~/.emacs.d"
+         :base-directory "."
          :publishing-directory ,mmk2410/dot-emacs-publish-publishing-dir
          :exclude ".*"
          :include ("config.org")
@@ -48,7 +48,7 @@
          :html-validation-link nil
          )
         ("dot-emacs:static"
-         :base-directory "~/.emacs.d/publish/assets"
+         :base-directory "./publish/assets"
          :publishing-directory ,mmk2410/dot-emacs-publish-publishing-dir
          :base-extension "css\\|woff\\|woff2\\|ico"
          :publishing-function org-publish-attachment