Commit aff2860ce02c227a66ab442250f2429726a80380

Sergey 'Jin' Bostandzhyan <jin @d…v.digitalstrom.org>
Sun Aug 29 00:47:44 CEST 2010

Tree SHA1: 455f21b
Parent SHA1: 9281e3f (Synced error codes with errlib.sh)
raw diff | raw patch

Fixed BST handling

Turned out that BST was a somewhat special case, there is no
/usr/share/zoneinfo/BST file to link to; when
/usr/share/zoneinfo/Europe/London is selected then date command can show
BST

So we're handling this special case now, by assuming that
BST is the same as Europe/London

Diff rendering mode:
inline
side by side


82	82	TIME=`date +%T`
83	83	UTC=`date -u +%s`
84	84	ZONE=`date +%Z`
	85	if [[ "$ZONE" == "BST" ]]; then
	86	ZONE="Europe/London"
	87	fi
85	88
86	89	echo -n "\"date\": \"$DATE\", \"time\": \"$TIME\", \"utcsecs\": $UTC, \"zoneshort\": \"$ZONE\", "
87	90	return $ERR_OK


77	77	return $ERR_OK
78	78	fi
79	79
80		if [[ ! -f "$ZONEINFO$1" ]]; then
	80	WANTED_TZ="$1"
	81	if [[ "$WANTED_TZ" == "BST" ]]; then
	82	WANTED_TZ="Europe/London"
	83	fi
	84
	85	if [[ ! -f "$ZONEINFO$WANTED_TZ" ]]; then
81	86	json_error $ERR_NOZONES "Requested time zone is not installed!"
82	87	return $ERR_NOZONES
83	88	fi
84	89
85	90	rm -f /etc/localtime 1>&2
86		ln -s "$ZONEINFO$1" /etc/localtime 1>&2
	91	ln -s "$ZONEINFO$WANTED_TZ" /etc/localtime 1>&2
87	92	if [[ "$?" -ne "0" ]]; then
88	93	json_error $ERR_LINK "Could not set requested zone, link failed!"
89	94	return $ERR_LINK

Commit aff2860ce02c227a66ab442250f2429726a80380

Gitorious