Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From c90306107fbbe2979012917e87747ce78c82ab88 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 18 Mar 2015 00:33:03 +0000 |
| 4 | Subject: [PATCH 17/27] timezone: re-written tzselect as posix sh |
| 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 24c93c6..886b06e 100644 |
| 19 | --- a/timezone/Makefile |
| 20 | +++ b/timezone/Makefile |
| 21 | @@ -126,7 +126,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 9d70691..25f45a8 100755 |
| 32 | --- a/timezone/tzselect.ksh |
| 33 | +++ b/timezone/tzselect.ksh |
| 34 | @@ -35,7 +35,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 | # Check for awk Posix compliance. |
| 42 | ($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1 |
| 43 | -- |
| 44 | 2.1.4 |
| 45 | |