| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 8d5ff7357354394b958321204b75e3855781aefe Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 9 Dec 2021 15:14:42 -0800 |
| 4 | Subject: [PATCH] timezone: Make shell interpreter overridable in tzselect.ksh |
| 5 | |
| 6 | define new macro called KSHELL which can be used to define default shell |
| 7 | use Bash by default |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | Makeconfig | 9 +++++++++ |
| 13 | timezone/Makefile | 1 + |
| 14 | 2 files changed, 10 insertions(+) |
| 15 | |
| 16 | diff --git a/Makeconfig b/Makeconfig |
| 17 | index ba70321af1..4b643768d9 100644 |
| 18 | --- a/Makeconfig |
| 19 | +++ b/Makeconfig |
| 20 | @@ -293,6 +293,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 |
| 36 | diff --git a/timezone/Makefile b/timezone/Makefile |
| 37 | index a789c22d26..3e69409a94 100644 |
| 38 | --- a/timezone/Makefile |
| 39 | +++ b/timezone/Makefile |
| 40 | @@ -134,6 +134,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 $@ |