mostly fixes, a few improvements

[distro-setup] / my-update-info-dir

diff --git a/my-update-info-dir b/my-update-info-dir
index 92235ea56a0a2284f66890645772dca7f275f624..f97b5985da7f3583fc98dc85d5793dd056845005 100755 (executable)
--- a/my-update-info-dir
+++ b/my-update-info-dir
@@ -4,13 +4,14 @@
 INFODIR=/usr/share/info
 sudo rm -f "$INFODIR/dir"
 
-for dir in $(emacs --batch --eval '(progn(package-initialize) (dolist (x Info-directory-list) (message x)))' |& sort -u); do
+shopt -s nullglob
+
+for dir in $(emacs --batch --eval '(progn(package-initialize) (dolist (x Info-directory-list) (message x)))' |& sed 's,/$,,' | sort -u); do
 
   case ${dir%/} in
     # this is from /usr/sbin/update-info-dir
     */info)
 
-      echo $dir
       find $dir -type f | while read file ; do
         case $file in
           */dir|*/dir.gz|*/dir.old|*/dir.old.gz|*-[0-9]|*-[0-9].gz|*-[1-9][0-9]|*-[1-9][0-9].gz|*.png|*.jpg)
@@ -28,7 +29,7 @@ for dir in $(emacs --batch --eval '(progn(package-initialize) (dolist (x Info-di
     [^/]*) : ;;
     *)
       for file in $dir/*.info*; do
-        #echo $file
+        echo $file
         sudo install-info "$file" "$INFODIR/dir"
       done
       ;;