diff mbox series

[bug#78700] gnu: tlp: Fix scripts.

Message ID CH3PR84MB3424ADBE0AF04CBCAFF8A040C56FA@CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM
State New
Headers
Series [bug#78700] gnu: tlp: Fix scripts. |

Commit Message

Morgan Smith June 5, 2025, 3:42 p.m. UTC 
  tlp provides a number of executables.  Before this change the "tlp" and "tlp-stat"
executables worked fine but the "bluetooth", "nfc", "run-on-ac", "run-on-bat",
"wifi", and "wwan" executables would give strange warnings.

* gnu/packages/linux.scm (tlp): Fix scripts.
<phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell
argument "$0".  Don't wrap symlinks.
<inputs>: Add guile-3.0 for wrap-script.  Remove bash used for now removed
wrap-program.

Change-Id: I916a4385cb69db142f834839aa9aaf0d81085714
---
 gnu/packages/linux.scm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)


base-commit: 027a47787f8dcf6651a1c20c5b475376defe6d6b

Comments

Ludovic Courtès June 9, 2025, 8:04 p.m. UTC | #1 
Morgan Smith <Morgan.J.Smith@outlook.com> writes:

> tlp provides a number of executables.  Before this change the "tlp" and "tlp-stat"
> executables worked fine but the "bluetooth", "nfc", "run-on-ac", "run-on-bat",
> "wifi", and "wwan" executables would give strange warnings.
>
> * gnu/packages/linux.scm (tlp): Fix scripts.
> <phases> [wrap]: Use wrap-script instead of wrap-program to preserve shell
> argument "$0".  Don't wrap symlinks.
> <inputs>: Add guile-3.0 for wrap-script.  Remove bash used for now removed
> wrap-program.
>
> Change-Id: I916a4385cb69db142f834839aa9aaf0d81085714

Applied, thanks!
diff mbox series

Patch

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ccf0567827..504b09b0a7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -145,6 +145,7 @@  (define-module (gnu packages linux)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages haskell-apps)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
@@ -8512,11 +8513,11 @@  (define-public tlp
     (native-inputs
      (list shellcheck))
     (inputs
-     `(("bash" ,bash)
-       ("dbus" ,dbus)
+     `(("dbus" ,dbus)
        ("ethtool" ,ethtool)
        ("eudev" ,eudev)
        ("grep" ,grep)
+       ("guile" ,guile-3.0) ;for wrap-script
        ("hdparm" ,hdparm)
        ("inetutils" ,inetutils)
        ("iw" ,iw)
@@ -8574,15 +8575,20 @@  (define-public tlp
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (let* ((bin (string-append (assoc-ref outputs "out") "/bin"))
                      (sbin (string-append (assoc-ref outputs "out") "/sbin"))
-                     (bin-files (find-files bin ".*"))
-                     (sbin-files (find-files sbin ".*")))
+                     ;; Used to ignore symlinks which don't need wrapping
+                     (regular-file-predicate
+                      (lambda (file stat) (eq? 'regular (stat:type stat))))
+                     (bin-files (find-files bin regular-file-predicate))
+                     (sbin-files (find-files sbin regular-file-predicate)))
                 (define (bin-directory input-name)
                   (let ((p (assoc-ref inputs input-name)))
                     (and p (string-append p "/bin"))))
                 (define (sbin-directory input-name)
                   (string-append (assoc-ref inputs input-name) "/sbin"))
                 (for-each (lambda (program)
-                            (wrap-program program
+                            ;; Programs rely on $0 so we use wrap-script
+                            ;; instead of wrap-program
+                            (wrap-script program
                               `("PATH" ":" prefix
                                 ,(append
                                   (filter-map bin-directory