summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko van der Vossen2022-11-26 06:32:49 +0000
committerRemko van der Vossen2022-11-26 06:32:49 +0000
commit5401fd05eee90f094512cedf8c7547f0c976e58a (patch)
tree18f657f086d83b020969ad72103aac4d4ee93ab7
parent3161662b8c51aff1731384dd953a0ae131c8df07 (diff)
tzdata: use INSTALL_ROOT correctly
-rw-r--r--libs/tzdata/HISTORY3
-rwxr-xr-xlibs/tzdata/INSTALL23
2 files changed, 14 insertions, 12 deletions
diff --git a/libs/tzdata/HISTORY b/libs/tzdata/HISTORY
index 41f4e97612..0cdd4901de 100644
--- a/libs/tzdata/HISTORY
+++ b/libs/tzdata/HISTORY
@@ -1,3 +1,6 @@
+2022-11-26 Remko van der Vossen <wich@sourcemage.org>
+ * INSTALL: use INSTALL_ROOT correctly
+
2022-11-12 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2022f
diff --git a/libs/tzdata/INSTALL b/libs/tzdata/INSTALL
index 7611e050d2..dda6c55e49 100755
--- a/libs/tzdata/INSTALL
+++ b/libs/tzdata/INSTALL
@@ -4,30 +4,29 @@ TIMEZONES=('africa' 'antarctica' 'asia' 'australasia' 'backward' 'etcetera' \
'europe' 'factory' 'northamerica' 'southamerica')
# Remove files that should be hard linked, in case they are not
-if [ -d ${INSTALL_ROOT}/usr/share/zoneinfo ]; then
+if [ -d "${INSTALL_ROOT}/usr/share/zoneinfo" ]; then
while read FILE; do
- if [ -e $FILE ]; then
- rm ${INSTALL_ROOT}/$FILE
+ if [ -e "${INSTALL_ROOT}/$FILE" ]; then
+ rm "${INSTALL_ROOT}/$FILE"
fi
done < ${SPELL_DIRECTORY}/hard_linked_files
fi &&
-
-zic -d ${INSTALL_ROOT}/usr/share/zoneinfo ${TIMEZONES[@]} &&
-zic -d ${INSTALL_ROOT}/usr/share/zoneinfo/posix ${TIMEZONES[@]} &&
-zic -d ${INSTALL_ROOT}/usr/share/zoneinfo/right -L leapseconds ${TIMEZONES[@]} &&
+zic -d "${INSTALL_ROOT}/usr/share/zoneinfo" ${TIMEZONES[@]} &&
+zic -d "${INSTALL_ROOT}/usr/share/zoneinfo/posix" ${TIMEZONES[@]} &&
+zic -d "${INSTALL_ROOT}/usr/share/zoneinfo/right" -L leapseconds ${TIMEZONES[@]} &&
#If you want POSIX compatibility, use "America/New_York".
-zic -d ${INSTALL_ROOT}/usr/share/zoneinfo -p America/New_York &&
+zic -d "${INSTALL_ROOT}/usr/share/zoneinfo" -p America/New_York &&
-install -m444 -t ${INSTALL_ROOT}/usr/share/zoneinfo iso3166.tab zone.tab &&
+install -m444 -t "${INSTALL_ROOT}/usr/share/zoneinfo" iso3166.tab zone.tab &&
if [ $SET_LOCALTIME == "y" ]; then
if [ -z "$LOCAL_TIMEZONE" ]; then
LOCAL_TIMEZONE="UTC"
fi &&
- echo "Local Time Zone: " $LOCAL_TIMEZONE &&
+ echo "Local Time Zone: " $LOCAL_TIMEZONE &&
# zic -l breaks if /etc and /usr are on different partitions
- #zic -d ${INSTALL_ROOT}/usr/share/zoneinfo -l "$LOCAL_TIMEZONE" &&
- ln -sf ${INSTALL_ROOT}/usr/share/zoneinfo/$LOCAL_TIMEZONE ${INSTALL_ROOT}/etc/localtime
+ #zic -d "${INSTALL_ROOT}/usr/share/zoneinfo" -l "$LOCAL_TIMEZONE" &&
+ ln -sf "${INSTALL_ROOT}/usr/share/zoneinfo/$LOCAL_TIMEZONE" ${INSTALL_ROOT}/etc/localtime
fi