diff options
| author | Roland Hieber <rhi@pengutronix.de> | 2020-03-09 12:08:02 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2020-03-09 14:39:54 +0100 |
| commit | a4ecbe5d42a8b16d35b305ccb8b8a4463c47dc71 (patch) | |
| tree | aad96c4341273b9f00afac081c63ba4a18f32612 /scripts | |
| parent | 79075e1e4c766e4114c5609cb2a705a828da2d49 (diff) | |
| download | DistroKit-a4ecbe5d42a8b16d35b305ccb8b8a4463c47dc71.tar.gz DistroKit-a4ecbe5d42a8b16d35b305ccb8b8a4463c47dc71.tar.xz | |
ptxd_install_replace_figlet: remove redundant backport
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 <rhi@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh deleted file mode 100644 index b75690b..0000000 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> -# -# 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 - |