Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (5401fd05eee90f094512cedf8c7547f0c976e58a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (5401fd05eee90f094512cedf8c7547f0c976e58a)
  • Date: Sat, 26 Nov 2022 06:33:19 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

libs/tzdata/HISTORY | 3 +++
libs/tzdata/INSTALL | 23 +++++++++++------------
2 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 5401fd05eee90f094512cedf8c7547f0c976e58a
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

tzdata: use INSTALL_ROOT correctly

diff --git a/libs/tzdata/HISTORY b/libs/tzdata/HISTORY
index 41f4e97..0cdd490 100644
--- a/libs/tzdata/HISTORY
+++ b/libs/tzdata/HISTORY
@@ -1,3 +1,6 @@
+2022-11-26 Remko van der Vossen <wich AT sourcemage.org>
+ * INSTALL: use INSTALL_ROOT correctly
+
2022-11-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2022f

diff --git a/libs/tzdata/INSTALL b/libs/tzdata/INSTALL
index 7611e05..dda6c55 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



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (5401fd05eee90f094512cedf8c7547f0c976e58a), Remko van der Vossen, 11/26/2022

Archive powered by MHonArc 2.6.24.

Top of Page