From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Roland Hieber Date: Mon, 9 Mar 2020 12:08:02 +0100 Message-Id: <20200309110803.18125-1-rhi@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH 1/2] ptxd_install_replace_figlet: remove redundant backport List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: distrokit@pengutronix.de Cc: Roland Hieber The fix went upstream in PTXdist 2018.10.0 with commit 43bd490bdfd1 ("ptxd_install_replace_figlet: replace all backslashes, not only the first"), so our backport is no longer necessary, and also has no relevant diff to the upstream version. Signed-off-by: Roland Hieber --- scripts/lib/ptxd_make_xpkg_pkg.sh | 57 ------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 scripts/lib/ptxd_make_xpkg_pkg.sh diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh deleted file mode 100644 index b75690ba5ed7..000000000000 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2010 by Michael Olbrich -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# workaround for ptxdist-2018.10.0: override this function to the old -# variant from ptxdist-2018.09.0, as it is currently broken. -# - -export -fn ptxd_install_replace_figlet - -ptxd_install_replace_figlet() { - local dst="$1" - local placeholder="$2" - local value="$3" - local escapemode="$4" - local -a dirs ndirs pdirs sdirs ddirs - local mod_nfs mod_rw - - ptxd_install_setup && - echo "\ -install replace figlet: - file=${dst} - '${placeholder}' -> '\`figlet ${value}\`' -" && - - ptxd_exist "${dirs[@]/%/${dst}}" && - ptxd_figlet_helper() { - local value="$1" - local escapemode="$2" - figlet -d "${PTXDIST_SYSROOT_HOST}/share/figlet" -- "${value}" | \ - case "$escapemode" in - # /etc/issue needs each backslash quoted by another backslash. As - # the string is interpreted by the shell once more below, another - # level of quoting is needed such that every \ in the output of - # figlet needs to be replaced by \\\\. As a \ in sed needs to be - # quoted, too, this results in eight backslashes in the replacement - # string. - etcissue) sed 's,\\,\\\\\\\\,g';; - *) ;; - esac | \ - awk '{ if ($0 !~ "^ *$") printf("%s\\n", $0) }' # newlines for sed - } && - figlet="$(ptxd_figlet_helper "$value" "$escapemode")" && - sed -i -e "s#${placeholder}#${figlet}#g" "${dirs[@]/%/${dst}}" || - - ptxd_install_error "install_replace failed!" -} - -export -f ptxd_install_replace_figlet - -- 2.25.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de