fix: Move global Eask-file config to home (#194)

* fix: Move global Eask-file config to home * fix * rev
emacs-eask · Oct 13, 2023 · b45700e · b45700e
1 parent 0faeca4
commit b45700e
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 61 deletions.
diff --git a/lisp/_prepare.el b/lisp/_prepare.el
@@ -1028,7 +1028,7 @@ This uses function `locate-dominating-file' to look up directory tree."
                ;; for the sandbox.
                (eask-with-verbosity 'debug
                  (eask-ignore-errors  ; Again, without Eask-file needed!
-                   (if (eask-file-try-load "../")
+                   (if (eask-file-try-load "./")
                        (eask-msg "✓ Loading global Eask file in %s... done!" eask-file)
                      (eask-msg "✗ Loading global Eask file... missing!")))
                  (eask-msg ""))

diff --git a/lisp/core/status.el b/lisp/core/status.el
@@ -25,7 +25,7 @@
 
 (defun eask--environment-name ()
   "Get the working environment name."
-  (cond ((eask-global-p) "global (~/.eask/)")
+  (cond ((eask-global-p) "global (~/)")
         ((eask-config-p) (format "configuration (%s)" user-emacs-directory))
         (t               "development (./)")))
 

diff --git a/src/util.js b/src/util.js
@@ -185,7 +185,7 @@ function el_script(name) {
  */
 function _environment_name (argv) {
   if (argv.global)
-    return 'global (~/.eask/)';
+    return 'global (~/)';
   else if (argv.config)
     return 'configuration (~/.emacs.d/)';
   else

diff --git a/test/commands/config/run.sh b/test/commands/config/run.sh
@@ -28,7 +28,7 @@
 set -e
 
 echo "Copy test configuration"
-./test/fixtures/mini.emacs.d/scripts/copy_config.sh
+./test/fixtures/home/scripts/setup.sh
 
 echo "Testing config (~/.emacs.d/) commands..."
 eask archives  -c

diff --git a/test/commands/global/run.sh b/test/commands/global/run.sh
@@ -28,9 +28,9 @@
 set -e
 
 echo "Copy test configuration"
-./test/fixtures/mini.eask/scripts/copy_eask.sh
+./test/fixtures/home/scripts/setup.sh
 
-echo "Testing global (~/.eask/) commands..."
+echo "Testing global (~/) commands..."
 eask archives  -g
 
 eask install   -g spinner ivy beacon company fuzzy

diff --git a/test/fixtures/mini.eask/.gitignore → test/fixtures/home/.eask/.gitignore b/test/fixtures/mini.eask/.gitignore → test/fixtures/home/.eask/.gitignore
diff --git a/test/fixtures/mini.eask/init.el → test/fixtures/home/.eask/init.el b/test/fixtures/mini.eask/init.el → test/fixtures/home/.eask/init.el
diff --git a/test/fixtures/mini.emacs.d/.gitignore → test/fixtures/home/.emacs.d/.gitignore b/test/fixtures/mini.emacs.d/.gitignore → test/fixtures/home/.emacs.d/.gitignore
diff --git a/test/fixtures/mini.emacs.d/Eask → test/fixtures/home/.emacs.d/Eask b/test/fixtures/mini.emacs.d/Eask → test/fixtures/home/.emacs.d/Eask
diff --git a/test/fixtures/mini.emacs.d/RADME.md → test/fixtures/home/.emacs.d/RADME.md b/test/fixtures/mini.emacs.d/RADME.md → test/fixtures/home/.emacs.d/RADME.md
diff --git a/test/fixtures/mini.emacs.d/init.el → test/fixtures/home/.emacs.d/init.el b/test/fixtures/mini.emacs.d/init.el → test/fixtures/home/.emacs.d/init.el
diff --git a/test/fixtures/home/.gitignore b/test/fixtures/home/.gitignore
@@ -0,0 +1 @@
+!.eask
diff --git a/test/fixtures/mini.eask/Eask → test/fixtures/home/Eask b/test/fixtures/mini.eask/Eask → test/fixtures/home/Eask
@@ -1,6 +1,6 @@
-(package "mini.eask"
+(package "home"
          "0.0.1"
-         "Minimal test .eask")
+         "Minimal test for global config")
 
 (website-url "https://github.com/emacs-eask/mini.eask")
 (keywords "test")

diff --git a/.../fixtures/mini.eask/scripts/copy_eask.ps1 → test/fixtures/home/scripts/setup.ps1 b/.../fixtures/mini.eask/scripts/copy_eask.ps1 → test/fixtures/home/scripts/setup.ps1
@@ -22,4 +22,9 @@
 
 echo "Copy test configuration"
 mkdir "$env:USERPROFILE/AppData/Roaming/.eask"
-robocopy /e "./test/fixtures/mini.eask/" "$env:USERPROFILE/AppData/Roaming/.eask"
+robocopy /e "./test/fixtures/home/_eask/" "$env:USERPROFILE/AppData/Roaming/.eask"
+robocopy /e "./test/fixtures/home/Eask" "$env:USERPROFILE/AppData/Roaming/Eask"
+
+echo "Copy test configuration"
+mkdir "$env:USERPROFILE/AppData/Roaming/.emacs.d"
+robocopy /e "./test/fixtures/home/.emacs.d/" "$env:USERPROFILE/AppData/Roaming/.emacs.d"
diff --git a/test/fixtures/mini.eask/scripts/copy_eask.sh → test/fixtures/home/scripts/setup.sh b/test/fixtures/mini.eask/scripts/copy_eask.sh → test/fixtures/home/scripts/setup.sh
@@ -23,4 +23,8 @@
 #
 
 echo "Copy test .eask"
-cp -R ./test/fixtures/mini.eask/ ~/.eask
+cp -R ./test/fixtures/home/_eask/ ~/.eask
+cp -R ./test/fixtures/home/Eask ~/Eask
+
+echo "Copy test configuration"
+cp -R ./test/fixtures/home/.emacs.d/ ~/.emacs.d
diff --git a/test/fixtures/mini.emacs.d/scripts/copy_config.ps1 b/test/fixtures/mini.emacs.d/scripts/copy_config.ps1
diff --git a/test/fixtures/mini.emacs.d/scripts/copy_config.sh b/test/fixtures/mini.emacs.d/scripts/copy_config.sh