blob: e51b611f377823e8a39bd6188076cadc982b7ff0 [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05001From 3e8586eb3509e2f0d6dfb74be8f89a30b06b56e9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:33:03 +0000
4Subject: [PATCH 16/24] timezone: re-written tzselect as posix sh
5
6To avoid the bash dependency.
7
8Upstream-Status: Pending
9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11Signed-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
17diff --git a/timezone/Makefile b/timezone/Makefile
18index 99566cb..b6e757e 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)"|' \
30diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
31index 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--
442.6.4
45