[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1030560: Ugly // in symlinks



Control: reassign -1 dh-elpa-helper
Control: tags -1 + patch

On 2023-02-05 08:57 +0800, Dan Jacobson wrote:

> Package: elpa-csv-mode
> Version: 1.21-1
> Severity: minor
>
> We note the ugly double slashes. Yes, cosmetic problem only.
> ls -og ...
> /usr/share/emacs/site-lisp/elpa/csv-mode-1.21:
> -rw-r--r-- 1    32 01-18 18:15 Install.log.gz
> lrwxrwxrwx 1 72 01-18 18:15 csv-mode-autoloads.el ->
> /usr/share/emacs/site-lisp/elpa-src/csv-mode-1.21//csv-mode-autoloads.el
> lrwxrwxrwx 1    66 01-18 18:15 csv-mode-pkg.el -> /usr/share/emacs/site-lisp/elpa-src/csv-mode-1.21//csv-mode-pkg.el
> lrwxrwxrwx 1    68 01-18 18:15 csv-mode-tests.el -> /usr/share/emacs/site-lisp/elpa-src/csv-mode-1.21//csv-mode-tests.el
> -rw-r--r-- 1 15956 01-18 18:15 csv-mode-tests.elc
> lrwxrwxrwx 1    62 01-18 18:15 csv-mode.el -> /usr/share/emacs/site-lisp/elpa-src/csv-mode-1.21//csv-mode.el
> -rw-r--r-- 1 57160 01-18 18:15 csv-mode.elc

The symlinks are created by the /usr/lib/dh-elpa/helper/install script,
and it does this:

line39:
el_dir=$src_dir/${ELPA_DIR}/

line 53:
(cd ${elc_dir} && ln -sf ${el_dir}/* .)

I have attached a patch which drops the extra second slash.

Cheers,
       Sven

From ae5e65b77517dd2ce8bd2d74099bb9c36529f05b Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenjoac@gmx.de>
Date: Sun, 5 Feb 2023 20:08:27 +0100
Subject: [PATCH] helper scripts: Avoid double slashes in symlinks

Closes: #1030560
---
 helper/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helper/install b/helper/install
index 3152cf4..c0679bb 100755
--- a/helper/install
+++ b/helper/install
@@ -50,7 +50,7 @@ echo install/${ELPA_DIR}: byte-compiling for ${FLAVOR}
 # policy).  This makes complation easy, and also allows find-function
 # and find-library to work properly.  Also link all other top level
 # files and directories into the flavor directory
-(cd ${elc_dir} && ln -sf ${el_dir}/* .)
+(cd ${elc_dir} && ln -sf ${el_dir}* .)

 # Byte compile them
 (cd ${elc_dir}
--
2.39.1


Reply to: