[neon/backports-jammy/distrobox/Neon/unstable] debian: Remove hashbangs from the new Bash completion scripts

Michel Alexandre Salim null at kde.org
Fri Jul 14 11:42:05 BST 2023


Git commit 1c808523729fff8757aea24365f1f75c8f73b121 by Michel Alexandre Salim.
Committed on 22/09/2022 at 04:20.
Pushed by jriddell into branch 'Neon/unstable'.

Remove hashbangs from the new Bash completion scripts
Enable Salsa CI

Signed-off-by: Michel Alexandre Salim <michel at michel-slm.name>

M  +3    -1    debian/changelog
M  +2    -2    debian/control
A  +72   -0    debian/patches/fix_completions_with_hashbangs.diff
A  +1    -0    debian/patches/series
A  +15   -0    debian/salsa-ci.yml

https://invent.kde.org/neon/backports-jammy/distrobox/-/commit/1c808523729fff8757aea24365f1f75c8f73b121

diff --git a/debian/changelog b/debian/changelog
index 43ecbfd..b14bf85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 distrobox (1.4.1-1) unstable; urgency=low
 
   * New upstream version 1.4.1
+  * Remove hashbangs from the new Bash completion scripts
+  * Enable Salsa CI
 
- -- Michel Alexandre Salim <michel at michel-slm.name>  Wed, 21 Sep 2022 20:55:57 -0500
+ -- Michel Alexandre Salim <michel at michel-slm.name>  Wed, 21 Sep 2022 22:52:07 -0500
 
 distrobox (1.4.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9078851..c28cb7d 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Depends:
  podman | docker.io,
  ${misc:Depends},
 Description: Another tool for containerized command line environments on Linux
- Use any linux distribution inside your terminal. Distrobox uses podman or
- docker to create containers using the linux distribution of your choice.
+ Use any Linux distribution inside your terminal. Distrobox uses podman or
+ docker to create containers using the Linux distribution of your choice.
  Created container will be tightly integrated with the host, allowing to share
  the HOME directory of the user, external storage, external usb devices and
  graphical apps (X11/Wayland) and audio.
diff --git a/debian/patches/fix_completions_with_hashbangs.diff b/debian/patches/fix_completions_with_hashbangs.diff
new file mode 100644
index 0000000..d9234d0
--- /dev/null
+++ b/debian/patches/fix_completions_with_hashbangs.diff
@@ -0,0 +1,72 @@
+Description: Remove hashbangs from Bash completions
+ These files start with the #! sequence that marks interpreted scripts, but
+ they are bash completion scripts that is merely intended to be sourced.
+Author: Michel Alexandre Salim <michel at michel-slm.name>
+Bug-<Vendor>: <URL to the vendor bug report if any, optional>
+Forwarded: https://github.com/89luca89/distrobox/pull/431
+Last-Update: 2022-09-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/completions/distrobox
++++ b/completions/distrobox
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ _generate_from_help() {
+--- a/completions/distrobox-create
++++ b/completions/distrobox-create
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
+--- a/completions/distrobox-enter
++++ b/completions/distrobox-enter
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
+--- a/completions/distrobox-ephemeral
++++ b/completions/distrobox-ephemeral
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
+--- a/completions/distrobox-generate-entry
++++ b/completions/distrobox-generate-entry
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
+--- a/completions/distrobox-list
++++ b/completions/distrobox-list
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
+--- a/completions/distrobox-rm
++++ b/completions/distrobox-rm
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
+--- a/completions/distrobox-stop
++++ b/completions/distrobox-stop
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
+--- a/completions/distrobox-upgrade
++++ b/completions/distrobox-upgrade
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env bash
+ # shellcheck disable=all
+ 
+ if [ -e /usr/share/bash-completion/completions/distrobox ]; then
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d83e5cd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_completions_with_hashbangs.diff
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..36f4c9c
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,15 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "CI/CD configuration file" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+variables:
+  # no binary package
+  SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: '1'
+  SALSA_CI_DISABLE_CROSSBUILD_ARM64: '1'



More information about the Neon-commits mailing list