From 678af1f4762a939fd616d869c1cee89820530b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 30 Aug 2022 14:37:05 +0700 Subject: [PATCH] tzdata: remove posix if right/Canada/East-Saskatchewan exist Chance are both of them exist --- srcpkgs/tzutils/template | 2 +- srcpkgs/tzutils/tzdata.INSTALL | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 761361aca73..c0d3d6500e5 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -1,7 +1,7 @@ # Template file for 'tzutils' pkgname=tzutils version=2022c -revision=1 +revision=2 bootstrap=yes wrksrc="tzdb-${version}" short_desc="Time zone and daylight-saving time utilities" diff --git a/srcpkgs/tzutils/tzdata.INSTALL b/srcpkgs/tzutils/tzdata.INSTALL index a6a50de6a41..8e87d78afc7 100755 --- a/srcpkgs/tzutils/tzdata.INSTALL +++ b/srcpkgs/tzutils/tzdata.INSTALL @@ -3,8 +3,8 @@ pre) # Due to some reasons, some old timezone was kept # The latest one would be Canada/East-Saskatchewan in 2017c # Don't force remove on everyone since it will spit error on update - if [ ! -L usr/share/zoneinfo/right ] && - [ -f usr/share/zoneinfo/right/Canada/East-Saskatchewan ]; then + if [ -f usr/share/zoneinfo/right/Canada/East-Saskatchewan ]; then + rm -rf usr/share/zoneinfo/posix rm -rf usr/share/zoneinfo/right fi ;;