From 8509c296607dcc30c0fe33d46d13dd73d8b72920 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 6 Feb 2023 17:13:54 +0100 Subject: Refreshing use-bash.patch. Signed-off-by: Daniel Baumann --- debian/patches/debian/0004-use-bash.patch | 13 +++++++++++++ debian/patches/debian/0005-use-bash.patch | 13 ------------- debian/patches/series | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 debian/patches/debian/0004-use-bash.patch delete mode 100644 debian/patches/debian/0005-use-bash.patch diff --git a/debian/patches/debian/0004-use-bash.patch b/debian/patches/debian/0004-use-bash.patch new file mode 100644 index 00000000..182aa213 --- /dev/null +++ b/debian/patches/debian/0004-use-bash.patch @@ -0,0 +1,13 @@ +Author: Daniel Baumann +Description: Using bash instead of sh for edit-config. + It reads /etc/profile which often contains bash specific configuration. + +diff -Naurp netdata.orig/system/edit-config netdata/system/edit-config +--- netdata.orig/system/edit-config ++++ netdata/system/edit-config +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/bin/bash + + # shellcheck disable=SC1091 + [ -f /etc/profile ] && . /etc/profile diff --git a/debian/patches/debian/0005-use-bash.patch b/debian/patches/debian/0005-use-bash.patch deleted file mode 100644 index 53b7fc5b..00000000 --- a/debian/patches/debian/0005-use-bash.patch +++ /dev/null @@ -1,13 +0,0 @@ -Author: Daniel Baumann -Description: Using bash instead of sh for edit-config. - It reads /etc/profile which often contains bash specific configuration. - -diff -Naurp netdata.orig/system/edit-config.in netdata/system/edit-config.in ---- netdata.orig/system/edit-config.in -+++ netdata/system/edit-config.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/bin/bash - - [ -f /etc/profile ] && . /etc/profile - diff --git a/debian/patches/series b/debian/patches/series index 2f1a8df9..61304395 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,7 @@ debian/0001-use-system-python.patch debian/0002-use-system-exim4.patch debian/0003-use-python3.patch -debian/0005-use-bash.patch +debian/0004-use-bash.patch upstream/0001-allow-symlinks.patch upstream/0002-fix-FTCBFS.patch progress-linux/0001-send-email.patch -- cgit v1.2.3