mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
timezone-data: remove tzdata-setup script
now, on tz change, xbmc saves the timezone directly into /storage/.cache/timezone in format: TIMEZONE=xx/yy defaults to UTC if not (yet) set (first boot)
This commit is contained in:
parent
e1389854a2
commit
10972f677e
@ -50,9 +50,6 @@ post_makeinstall_target() {
|
|||||||
|
|
||||||
mkdir -p $INSTALL/etc
|
mkdir -p $INSTALL/etc
|
||||||
ln -sf /var/run/localtime $INSTALL/etc/localtime
|
ln -sf /var/run/localtime $INSTALL/etc/localtime
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib/openelec
|
|
||||||
cp -PR $PKG_DIR/scripts/tzdata-setup $INSTALL/usr/lib/openelec
|
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
################################################################################
|
|
||||||
# This file is part of OpenELEC - http://www.openelec.tv
|
|
||||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
|
||||||
#
|
|
||||||
# OpenELEC is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# OpenELEC is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
|
|
||||||
if [ -z "$1" ] ; then
|
|
||||||
# called from systemd. read timezone if set
|
|
||||||
if [ -f /storage/.cache/timezone ] ; then
|
|
||||||
TIMEZONE=`cat /storage/.cache/timezone`
|
|
||||||
else
|
|
||||||
if [ -f /storage/.xbmc/userdata/guisettings.xml ] ; then
|
|
||||||
TIMEZONE=`sed -n -e 's/.*<timezone>\(.*\)<\/timezone>.*/\1/p' /storage/.xbmc/userdata/guisettings.xml`
|
|
||||||
fi
|
|
||||||
if [ -z "TIMEZONE" ] ; then
|
|
||||||
TIMEZONE="UTC"
|
|
||||||
fi
|
|
||||||
# save it!
|
|
||||||
echo "$TIMEZONE" > /storage/.cache/timezone
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# called from xbmc. save the timezone!
|
|
||||||
TIMEZONE="$1"
|
|
||||||
echo "$TIMEZONE" > /storage/.cache/timezone
|
|
||||||
fi
|
|
||||||
|
|
||||||
ln -sf "/usr/share/zoneinfo/$TIMEZONE" /var/run/localtime
|
|
@ -2,11 +2,11 @@
|
|||||||
Description=Setup Timezone data
|
Description=Setup Timezone data
|
||||||
Before=xbmc.service
|
Before=xbmc.service
|
||||||
|
|
||||||
ConditionPathExists=/storage/.xbmc/userdata/guisettings.xml
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
ExecStart=/usr/lib/openelec/tzdata-setup
|
Environment=TIMEZONE=UTC
|
||||||
|
EnvironmentFile=-/storage/.cache/timezone
|
||||||
|
ExecStart=/bin/ln -sf /usr/share/zoneinfo/${TIMEZONE} /var/run/localtime
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
StartLimitInterval=0
|
StartLimitInterval=0
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user