blob: 0480c47b49884a0c0ea0fecddfc5610df1be7a7b [file] [log] [blame]
Andrew Geissler595f6302022-01-24 19:11:47 +00001From 76d170fbbfd07b26a0288212201e5d15558db36f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 9 Dec 2021 15:14:42 -0800
4Subject: [PATCH] Make shell interpreter overridable in tzselect.ksh
5
6define new macro called KSHELL which can be used to define default shell
7use Bash by default
8
9Upstream-Status: Submitted [https://patchwork.sourceware.org/project/glibc/patch/20211209234015.1554552-1-raj.khem@gmail.com/]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 Makeconfig | 9 +++++++++
13 timezone/Makefile | 1 +
14 2 files changed, 10 insertions(+)
15
16diff --git a/Makeconfig b/Makeconfig
17index 3fa2f13003..a1ea5d5571 100644
18--- a/Makeconfig
19+++ b/Makeconfig
20@@ -292,6 +292,15 @@ ifndef sysincludedir
21 sysincludedir = /usr/include
22 endif
23
24+# The full path name of a Posix-compliant shell, preferably one that supports
25+# the Korn shell's 'select' statement as an extension.
26+# These days, Bash is the most popular.
27+# It should be OK to set this to /bin/sh, on platforms where /bin/sh
28+# lacks 'select' or doesn't completely conform to Posix, but /bin/bash
29+# is typically nicer if it works.
30+ifndef KSHELL
31+KSHELL = /bin/bash
32+endif
33
34 # Commands to install files.
35 ifndef INSTALL_DATA
36diff --git a/timezone/Makefile b/timezone/Makefile
37index c624a189b3..dc8f5277de 100644
38--- a/timezone/Makefile
39+++ b/timezone/Makefile
40@@ -127,6 +127,7 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
41 -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
42 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
43 -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
44+ -e 's|#!/bin/bash|#!$(KSHELL)|g' \
45 < $< > $@.new
46 chmod 555 $@.new
47 mv -f $@.new $@
48--
492.34.1
50