summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-06 16:13:54 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-06 16:14:14 +0000
commit8509c296607dcc30c0fe33d46d13dd73d8b72920 (patch)
treef33955687f3ae0f049ec6f85736ec09dba088ee4
parentMerging upstream version 1.38.0. (diff)
downloadnetdata-8509c296607dcc30c0fe33d46d13dd73d8b72920.tar.xz
netdata-8509c296607dcc30c0fe33d46d13dd73d8b72920.zip
Refreshing use-bash.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/debian/0004-use-bash.patch (renamed from debian/patches/debian/0005-use-bash.patch)8
-rw-r--r--debian/patches/series2
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/debian/0005-use-bash.patch b/debian/patches/debian/0004-use-bash.patch
index 53b7fc5b3..182aa2131 100644
--- a/debian/patches/debian/0005-use-bash.patch
+++ b/debian/patches/debian/0004-use-bash.patch
@@ -2,12 +2,12 @@ Author: Daniel Baumann <daniel.baumann@progress-linux.org>
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
+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/series b/debian/patches/series
index 2f1a8df93..613043957 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