[nongnu] elpa/datetime fb324e2c79 044/147: Fix `generate-extmaps.sh' again, to avoid depending on `load-path' order, which apparently changed in newer Emacs versions.

[ELPA Syncer]

branch: elpa/datetime
commit fb324e2c79c0eb86219237c5f371559265bb24f2
Author: Paul Pogonyshev <pogonys...@gmail.com>
Commit: Paul Pogonyshev <pogonys...@gmail.com>

    Fix `generate-extmaps.sh' again, to avoid depending on `load-path' order, 
which apparently changed in newer Emacs versions.
---
 generate-extmaps.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/generate-extmaps.sh b/generate-extmaps.sh
index fcac353fd4..a914823487 100755
--- a/generate-extmaps.sh
+++ b/generate-extmaps.sh
@@ -17,13 +17,15 @@ cd ..
 java -cp dev HarvestData --locales | tr "\n" " "                               
                                                 \
   | $EMACS -batch                                                              
                                                 \
           --eval "(progn (require 'package) (package-initialize))"             
                                                 \
-          --eval "(when (locate-file \"local-environment.el\" (list (car 
load-path))) (load \"local-environment.el\" nil t t))" \
+          --eval "(let ((local-environment (locate-file 
\"local-environment.el\" (list default-directory))))                    \
+                    (when local-environment (load local-environment nil t 
t)))"                                                 \
           --eval "(require 'extmap)"                                           
                                                 \
           --eval "(extmap-from-alist \"locale-data.extmap\" (read-minibuffer 
\"\") :overwrite t)"
 
 java -cp dev HarvestData --timezones | tr "\n" " "                             
                                                 \
   | $EMACS -batch                                                              
                                                 \
           --eval "(progn (require 'package) (package-initialize))"             
                                                 \
-          --eval "(when (locate-file \"local-environment.el\" (list (car 
load-path))) (load \"local-environment.el\" nil t t))" \
+          --eval "(let ((local-environment (locate-file 
\"local-environment.el\" (list default-directory))))                    \
+                    (when local-environment (load local-environment nil t 
t)))"                                                 \
           --eval "(require 'extmap)"                                           
                                                 \
           --eval "(extmap-from-alist \"timezone-data.extmap\" (read-minibuffer 
\"\") :overwrite t)"