From: Tobias Geerinckx-Rice via Guix-patches via <guix-patches@gnu.org>
To: david larsson <david.larsson@selfhosted.xyz>
Cc: 51512@debbugs.gnu.org
Subject: [bug#51512] [PATCH v 2]: gnu: Add bash-bcu.
Date: Sat, 20 Nov 2021 15:11:30 +0100 [thread overview]
Message-ID: <87y25inbsu.fsf@nckx> (raw)
In-Reply-To: <93d8232c104dc63f46f6b975073b56ca@selfhosted.xyz>
[-- Attachment #1.1: Type: text/plain, Size: 1158 bytes --]
David,
david larsson 写道:
> Not sure if u intended to attach ur modified version of the
> patch when
> you replied or not.
Absolutely. Oops! Here it is, belatedly, and possibly
pointlessly.
> Basically just to make minimal disruption of the the current
> environment when you source bcu.sh. Almost certainly a non-issue
> 99.9%
> of cases, i.e. I think that just prepending /run/setuid-programs
> to
> PATH would be fine as well.
The current package does much ‘worse’ comparatively:
> + ":" (assoc-ref %build-inputs "bindutils") "/bin"
> + ":" (assoc-ref %build-inputs "coreutils") "/bin"
> + ":" (assoc-ref %build-inputs "ctypes.sh") "/bin"
> + ":" (assoc-ref %build-inputs "curl") "/bin"
> […many more…]
However, you make an excellent point, and this packages's intended
usage means that it will clobber the caller's environment, not
just its own.
If I were to use this package (and I might—it's neat) I would
almost certainly end up using it in a setting where changing PATH
at all would cause unexpected and frustrating ‘bugs’.
Hmm…
Kind regards,
T G-R
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: wip-bcu.patch --]
[-- Type: text/x-patch, Size: 12224 bytes --]
From 2ee51b0224c6f3bf9720d217346f53e3cb94e68a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 8 Nov 2021 21:09:17 +0100
Subject: [PATCH 06/10] wip bcu
---
gnu/packages/bash.scm | 196 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 196 insertions(+)
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index ed2931fd97..114ea1dcac 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -25,17 +25,34 @@
(define-module (gnu packages bash)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
+ #:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages curl)
+ #:use-module (gnu packages dns)
+ #:use-module (gnu packages ed)
#:use-module (gnu packages elf)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gawk)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages networking)
#:use-module (gnu packages readline)
#:use-module (gnu packages bison)
#:use-module (gnu packages linux)
#:use-module (gnu packages libffi)
+ #:use-module (gnu packages pcre)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages php)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages guile)
+ #:use-module (gnu packages guile-xyz)
+ #:use-module (gnu packages tcl)
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages xml)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -448,3 +465,182 @@ (define-public bash-ctypes
function interface (FFI) directly in your shell. In other words, it allows
you to call routines in shared libraries from within Bash.")
(license license:expat)))
+
+(define-public bash-coding-utils
+ (let ()
+ (package
+ (name "bash-coding-utils")
+ (version "0.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (commit "40d6527a9effb4e18778c37bebaa9f3a58de12d6")
+ (url "https://gitlab.com/methuselah-0/bash-coding-utils.sh.git")
+ ;; Include submodules/. TODO: These seem to be worth packaging?
+ (recursive? #t)))
+ (sha256
+ (base32 "007g6wfybjr0ms32qikb545r11lgm3p98cd7dbzpfyh0grgn9vj1"))))
+ (inputs `(("bash" ,bash)
+ ("bindutils" ,isc-bind "utils")
+ ("coreutils" ,coreutils)
+ ("ctypes.sh" ,bash-ctypes)
+ ("curl" ,curl)
+ ("diffutils" ,diffutils)
+ ("ed" ,ed)
+ ("expect" ,expect)
+ ("find" ,findutils)
+ ("gawk" ,gawk)
+ ("grep" ,grep)
+ ("guile" ,guile-3.0)
+ ("guile-bash" ,guile-bash)
+ ("guile-daemon" ,guile-daemon)
+ ("inetutils" ,inetutils)
+ ("jq" ,jq)
+ ("libxml2-xpath0" ,libxml2-xpath0)
+ ("netcat" ,netcat)
+ ("nmap" ,nmap)
+ ("pcre/bin" ,pcre "bin")
+ ("perl" ,perl)
+ ("php" ,php)
+ ("prips" ,prips)
+ ("python" ,python)
+ ("python-elementpath" ,python-elementpath)
+ ("python-lxml" ,python-lxml)
+ ("python-netaddr" ,python-netaddr)
+ ("python-yq" ,python-yq)
+ ("sed" ,sed)
+ ("socat" ,socat)
+ ("util-linux" ,util-linux)
+ ("which" ,which)
+ ("xdg-utils" ,xdg-utils)
+ ("yad" ,yad)))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((bash (assoc-ref %build-inputs "bash"))
+ ;; Some Guile libraries such as GNU Bash will need
+ ;; to be added to GUILE_LOAD_PATH.
+ (guile-bash (assoc-ref %build-inputs "guile-bash"))
+ (g-bash-lib (string-append guile-bash
+ "/share/guile/site/"
+ ,(version-major+minor (package-version guile-3.0))))
+ ;; Some Python libraries needs added to PYTHONPATH.
+ (python-version ,(version-major+minor (package-version python)))
+ (p-elementpath-lib (string-append
+ (assoc-ref %build-inputs "python-elementpath")
+ "/lib/python" python-version "/site-packages"))
+ (p-lxml-lib (string-append
+ (assoc-ref %build-inputs "python-lxml")
+ "/lib/python" python-version "/site-packages"))
+ (p-netaddr-lib (string-append
+ (assoc-ref %build-inputs "python-netaddr")
+ "/lib/python" python-version "/site-packages"))
+ (p-lib (string-append
+ (assoc-ref %build-inputs "python")
+ "/lib/python" python-version "/site-packages"))
+ (pylibsline (string-append
+ p-elementpath-lib ":" p-lxml-lib
+ ":" p-netaddr-lib ":" p-lib))
+ (out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin"))
+ ;; Everything but bcu.sh itself is only accessed
+ ;; internally by bcu so we put it in libexec.
+ (libexec (string-append out "/libexec/bcu")))
+ (mkdir-p libexec)
+ (copy-recursively (assoc-ref %build-inputs "source") libexec)
+ ;; Create a bcu.sh wrapping script manually that ensures
+ ;; we prepend necessary PATHs.
+ (mkdir-p bin)
+ (let* ((bcu.sh (string-append bin "/bcu.sh"))
+ (path (string-append
+ "/run/setuid-programs"
+ ":" bash "/bin"
+ ":" (assoc-ref %build-inputs "bindutils") "/bin"
+ ":" (assoc-ref %build-inputs "coreutils") "/bin"
+ ":" (assoc-ref %build-inputs "ctypes.sh") "/bin"
+ ":" (assoc-ref %build-inputs "curl") "/bin"
+ ":" (assoc-ref %build-inputs "diffutils") "/bin"
+ ":" (assoc-ref %build-inputs "ed") "/bin"
+ ":" (assoc-ref %build-inputs "expect") "/bin"
+ ":" (assoc-ref %build-inputs "find") "/bin"
+ ":" (assoc-ref %build-inputs "gawk") "/bin"
+ ":" (assoc-ref %build-inputs "grep") "/bin"
+ ":" (assoc-ref %build-inputs "guile") "/bin"
+ ":" (assoc-ref %build-inputs "inetutils") "/bin"
+ ":" (assoc-ref %build-inputs "jq") "/bin"
+ ":" (assoc-ref %build-inputs "libxml2-xpath0") "/bin"
+ ":" (assoc-ref %build-inputs "netcat") "/bin"
+ ":" (assoc-ref %build-inputs "nmap") "/bin"
+ ":" (assoc-ref %build-inputs "pcre/bin") "/bin"
+ ":" (assoc-ref %build-inputs "perl") "/bin"
+ ":" (assoc-ref %build-inputs "php") "/bin"
+ ":" (assoc-ref %build-inputs "prips") "/bin"
+ ":" (assoc-ref %build-inputs "python") "/bin"
+ ":" (assoc-ref %build-inputs "python-yq") "/bin"
+ ":" (assoc-ref %build-inputs "sed") "/bin"
+ ":" (assoc-ref %build-inputs "socat") "/bin"
+ ":" (assoc-ref %build-inputs "util-linux") "/bin"
+ ":" (assoc-ref %build-inputs "which") "/bin"
+ ":" (assoc-ref %build-inputs "xdg-utils") "/bin"
+ ":" (assoc-ref %build-inputs "yad") "/bin")))
+ (with-output-to-file bcu.sh
+ (lambda _
+ (display (string-append "#!" bash "/bin/bash\n"))
+ (display "[[ \"$_BCU_SH_LOADED\" == YES ]] || { \n")
+ (display (string-append "export PATH=\"" path
+ "${PATH:+:}${PATH}\"\n"))
+ (display (string-append "export PYTHONPATH=\"" pylibsline
+ "${PYTHONPATH:+:}${PYTHONPATH}\"\n"))
+ (display
+ (string-append "export GUILE_LOAD_PATH=\"" g-bash-lib
+ "${GUILE_LOAD_PATH:+:}${GUILE_LOAD_PATH}\"\n"))
+ ;; XDG_DATA_DIRS needs set for yad to load icons properly.
+ (display (string-append
+ "[[ -e /run/current-system/profile/share ]] && "
+ "export XDG_DATA_DIRS="
+ "/run/current-system/profile/share"
+ "${XDG_DATA_DIRS:+:}${XDG_DATA_DIRS}\n"))
+ (display (string-append "source " libexec "/bcu.sh\n"))
+ (display "}\n")))
+ (chmod bcu.sh #o555)
+ (setenv "PATH" (string-append path ":" (getenv "PATH"))))
+ (substitute* (find-files out ".*\\.sh")
+ (("~/\\.guix-profile/lib/bash/libguile-bash\\.so")
+ (string-append guile-bash "/lib/bash/libguile-bash.so"))
+ (("\"\\$GUIX_PROFILE\"/lib/bash/libguile-bash\\.so")
+ (string-append guile-bash "/lib/bash/libguile-bash.so")))
+ (for-each (lambda (file)
+ (patch-shebang file))
+ (find-files out ".*\\.(sh|scm|awk|php|py)$") )
+ ;; Set up PATH for tests.
+ (setenv "PATH" (string-append bin ":" (getenv "PATH")))
+ ;; Some tests need a HOME directory.
+ (setenv "HOME" "/tmp")
+ ;; Disable network tests, and all tests for setopts which
+ ;; don't work inside the Guix build environment.
+ (with-output-to-file (string-append libexec "/disabled_tests.txt")
+ (lambda _
+ (format #t "~{~a~%~}"
+ (list "ip_of_test_1"
+ "setopts_test_1"
+ "setopts_test_2"
+ "setopts_test_3"
+ "setopts_test_4"
+ "setopts_test_5"
+ "setopts_test_6"))))
+ (invoke (string-append libexec "/bcu-test.sh"))))))
+ (home-page "https://gitlab.com/methuselah-0/bash-coding-utils.sh")
+ (synopsis "Functions and tools for software prototyping in Bash")
+ (description
+ "This package contains Bash functions and wrappers that can be useful
+when writing quick implementations of new programs. It helps you work with
+JSON, XML, and parallelization, and installs some commonly used helper programs
+used in Bash scripting. Just run @command{. bcu.sh}, type @command{bcu__}, hit
+@key{TAB} to see available functions and give any of them the @code{--help}
+flag to see how to use it, or run @command{bcu__docs} for the full HTML
+documentation.")
+ (license license:gpl3))))
--
2.34.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
next prev parent reply other threads:[~2021-11-20 14:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-30 14:59 [bug#51512] [PATCH]: gnu: Add bash-bcu david larsson
2021-11-07 12:40 ` Tobias Geerinckx-Rice via Guix-patches via
2021-11-09 12:32 ` [bug#51512] [PATCH v 2]: " david larsson
2021-11-20 14:11 ` Tobias Geerinckx-Rice via Guix-patches via [this message]
2021-11-23 12:44 ` david larsson
2022-07-01 18:13 ` [bug#51512] [PATCH v 3]: " david larsson
2022-08-02 20:21 ` david larsson
2022-08-27 18:29 ` david larsson
2023-05-20 19:23 ` david larsson
2023-05-20 19:28 ` david larsson
2023-05-20 20:16 ` [bug#51512] [PATCH v 4]: " david larsson
2021-11-15 16:45 ` Recommend order for package fields? zimoun
2021-11-16 18:54 ` Katherine Cox-Buday
2021-11-17 11:15 ` Ludovic Courtès
2021-11-17 11:18 ` Ludovic Courtès
2021-11-17 11:40 ` zimoun
2021-11-19 14:51 ` Ludovic Courtès
2022-07-04 21:11 ` [bug#51512] [PATCH]: gnu: Add bash-bcu ( via Guix-patches via
2022-07-04 21:21 ` ( via Guix-patches via
2023-05-21 6:58 ` [bug#51512] [PATCH v5]: " david larsson
2023-05-23 4:51 ` [bug#51512] [PATCH v6 0/3]: " david larsson
2023-05-23 4:53 ` [bug#51512] [PATCH v6 1/3]: " david larsson
2023-05-23 4:55 ` [bug#51512] [PATCH v6 2/3]: gnu: Add guile-bash-for-bash-coding-utils david larsson
2023-05-23 4:56 ` [bug#51512] [PATCH v6 3/3]: gnu: Add bash-coding-utils david larsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y25inbsu.fsf@nckx \
--to=guix-patches@gnu.org \
--cc=51512@debbugs.gnu.org \
--cc=david.larsson@selfhosted.xyz \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.