Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 1 | From 4762386b599f5c3287310a69ad3555e0129e0c51 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 18 Mar 2015 00:33:03 +0000 |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 16/29] timezone: re-written tzselect as posix sh |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | To avoid the bash dependency. |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | timezone/Makefile | 2 +- |
| 14 | timezone/tzselect.ksh | 2 +- |
| 15 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/timezone/Makefile b/timezone/Makefile |
| 18 | index 75f38df527..74e1ab7ff7 100644 |
| 19 | --- a/timezone/Makefile |
| 20 | +++ b/timezone/Makefile |
| 21 | @@ -122,7 +122,7 @@ $(testdata)/XT%: testdata/XT% |
| 22 | cp $< $@ |
| 23 | |
| 24 | $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make |
| 25 | - sed -e 's|/bin/bash|$(BASH)|' \ |
| 26 | + sed -e 's|/bin/bash|/bin/sh|' \ |
| 27 | -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ |
| 28 | -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ |
| 29 | -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ |
| 30 | diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh |
| 31 | index 18fce27e24..70745f9d36 100755 |
| 32 | --- a/timezone/tzselect.ksh |
| 33 | +++ b/timezone/tzselect.ksh |
| 34 | @@ -34,7 +34,7 @@ REPORT_BUGS_TO=tz@iana.org |
| 35 | |
| 36 | # Specify default values for environment variables if they are unset. |
| 37 | : ${AWK=awk} |
| 38 | -: ${TZDIR=`pwd`} |
| 39 | +: ${TZDIR=$(pwd)} |
| 40 | |
| 41 | # Output one argument as-is to standard output. |
| 42 | # Safer than 'echo', which can mishandle '\' or leading '-'. |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 43 | -- |
| 44 | 2.27.0 |
| 45 | |