Attachment #60141 for bug #90369

View | Details | Raw Unified | Return to bug 90369
Collapse All | Expand All

Lines 6-14 Link Here

(-)games/hattrickorganizer-136/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= hattrickorganizer	8	PORTNAME= hattrickorganizer
9	PORTVERSION= 1.35	9	PORTVERSION= 1.36
10	CATEGORIES= games java	10	CATEGORIES= games java
11	MASTER_SITES= http://www.wow-auctions.net/ho/download/	11	MASTER_SITES= http://www.wow-auctions.net/ho/download/ \
		12	http://www.bsd-geek.de/FreeBSD/distfiles/
12	DISTNAME= ho_${PORTVERSION:S/.//g}	13	DISTNAME= ho_${PORTVERSION:S/.//g}
13		14
14	MAINTAINER= lars.engels@0x20.net	15	MAINTAINER= lars.engels@0x20.net

Lines 1-2 Link Here

(-)games/hattrickorganizer-136/distinfo (-2 / +2 lines)
1	MD5 (ho_135.zip) = 6fcab1f6225d566255689efd59a7ca1c	1	MD5 (ho_136.zip) = b79026fba1fb9c596d70b23cd1119ebd
2	SIZE (ho_135.zip) = 3904639	2	SIZE (ho_136.zip) = 4166641

Lines 27-33 Link Here

(-)games/hattrickorganizer-136/files/hattrickorganizer.sh.in (-11 / +70 lines)
27	# - edit the HODIR variable to this new directory (without the ``) #	27	# - edit the HODIR variable to this new directory (without the ``) #
28	# and HOHOME to any user writable directory! #	28	# and HOHOME to any user writable directory! #
29	# #	29	# #
30	# - start HO! out of a terminal via e.g. 'ho' #	30	# - start HO! out of a terminal via e.g. 'hattrickorganizer' #
31	# #	31	# #
32	# - manage your team :) #	32	# - manage your team :) #
33	# #	33	# #
Lines 107-112 Link Here
107	SPRACHDIR=$HOHOME/sprache	107	SPRACHDIR=$HOHOME/sprache
108		108
109		109
		110	# required java version
		111
		112	JAVAVERREQ=1.4.1
		113
		114	# Which database files and name of backup file?
		115
110	# Which database files and name of backup file?	116	# Which database files and name of backup file?
111		117
112	BACKUPLIST="database.data database.script database.backup database.properties"	118	BACKUPLIST="database.data database.script database.backup database.properties"
Lines 151-157 Link Here
151	Options:	157	Options:
152	-h --help This help text	158	-h --help This help text
153	-v --version Show HO! version	159	-v --version Show HO! version
		160	-f --force Start without checking java-version
154	-nb --nobackup Start without backup	161	-nb --nobackup Start without backup
		162	-j --java <path> Use this java
155	-r --restore Restore the last backup-file	163	-r --restore Restore the last backup-file
156	-rd --restoredate <date>	164	-rd --restoredate <date>
157	Restore the backup-file from <date>	165	Restore the backup-file from <date>
Lines 167-184 Link Here
167	cd $HOHOME	175	cd $HOHOME
168	JAVA_VERSION="%%JAVA_VERSION%%" "${JAVA}" -jar $HODIR/hocoded.jar	176	JAVA_VERSION="%%JAVA_VERSION%%" "${JAVA}" -jar $HODIR/hocoded.jar
169		177
170	# check database and print warning	178	# check database and print warning
171	if [ `grep modified $DATABASEDIR/database.properties \| \	179	if [ `grep modified $DATABASEDIR/database.properties \| \
172	cut -d= -f2` = "no" ]	180	cut -d= -f2` = "no" ]
173	then	181	then
174	echo "Database OK!"	182	echo "Database OK!"
175	else	183	else
176	cat <<-EOF >&2	184	cat <<-EOF >&2
177	Database was not relased correctly!	185	Database was not relased correctly!
178	Probably next time you will have problems starting HO...	186	Probably next time you will have problems starting HO...
179	... but you can restore a backup with switches -r or -rd. :-)	187	... but you can restore a backup with switches -r or -rd. :-)
180	EOF	188	EOF
181	fi	189	fi
182	}	190	}
183		191
184	# Backup	192	# Backup
Lines 235-242 Link Here
235	if [ -r "$BACKUPDIR/$PREFIX-$RESTOREDATE.tgz" ]	243	if [ -r "$BACKUPDIR/$PREFIX-$RESTOREDATE.tgz" ]
236	then	244	then
237	gunzip -c "$BACKUPDIR/$PREFIX-$RESTOREDATE.tgz" \| tar -xf -	245	gunzip -c "$BACKUPDIR/$PREFIX-$RESTOREDATE.tgz" \| tar -xf -
238	echo "Restored database from $BACKUPDIR/ \	246	echo "Restored database from $BACKUPDIR/$PREFIX-$RESTOREDATE.tgz"
239	$PREFIX-$RESTOREDATE.tgz"
240	else	247	else
241	echo "Error reading backup file $BACKUPDIR/$PREFIX-$RESTOREDATE.tgz!" >&2	248	echo "Error reading backup file $BACKUPDIR/$PREFIX-$RESTOREDATE.tgz!" >&2
242	exit 2	249	exit 2
Lines 244-249 Link Here
244	fi	251	fi
245	}	252	}
246		253
		254	# Check java -version
		255
		256	checkjava(){
		257	test -x "$JAVA" \|\| { echo "Can't find java!" ; exit 1 ; }
		258	JAVAVER=`$JAVA -version 2>&1 \| head -n 1 \| \
		259	awk -F\" '{print $2}' \| sed s/[^0-9\.].*//g`
		260	JAVAMAJ=`echo $JAVAVER \| awk -F. '{print $1}'`
		261	JAVAMIN=`echo $JAVAVER \| awk -F. '{print $2}'`
		262	JAVAMINMIN=`echo $JAVAVER \| awk -F. '{print $3}'`
		263	JAVAMAJREQ=`echo $JAVAVERREQ \| awk -F. '{print $1}'`
		264	JAVAMINREQ=`echo $JAVAVERREQ \| awk -F. '{print $2}'`
		265	JAVAMINMINREQ=`echo $JAVAVERREQ \| awk -F. '{print $3}'`
		266	if ( [ $JAVAMAJ = "" ] \|\| [ $JAVAMIN = "" ] \
		267	\|\| [ $JAVAMINMIN = "" ] ) ; then
		268	echo -e "Couldn't check java version! \n
		269	Try '$HONAME -f' to override the version check" >&2
		270	exit 3
		271	fi
		272	if ( [ $JAVAMAJ -lt $JAVAMAJREQ ] \|\| \
		273	( [ $JAVAMAJ -eq $JAVAMAJREQ ] && \
		274	[ $JAVAMIN -lt $JAVAMINREQ ] ) \|\| \
		275	( [ $JAVAMAJ -eq $JAVAMAJREQ ] && \
		276	[ $JAVAMIN -eq $JAVAMINREQ ] && \
		277	[ $JAVAMINMIN -lt $JAVAMINMINREQ ] ) )
		278	then
		279	cat <<-EOF >&2
		280	The default Java version is too old!
		281	You could try another one: '$HONAME -j <path>'
		282	EOF
		283	exit 3
		284	fi
		285	}
		286
247	### MAIN	287	### MAIN
248		288
249	# Run throuh the params	289	# Run throuh the params
Lines 251-256 Link Here
251	until [ -z "$1" ]	291	until [ -z "$1" ]
252	do	292	do
253	case "$1" in	293	case "$1" in
		294	-j\|--java)
		295	JAVA=$2;
		296	if [ -z $JAVA ]
		297	then
		298	echo "Option j or java needs a parameter!" >&2
		299	exit 1
		300	fi
		301	shift
		302	;;
254	-v\|--version)	303	-v\|--version)
255	echo "This is HO! version $HOVERSION";	304	echo "This is HO! version $HOVERSION";
256	exit 0	305	exit 0
Lines 299-304 Link Here
299	done	348	done
300		349
301		350
		351	# Check for java -version (if called without `force')
		352
		353	`$CHECK` && checkjava
		354
302	# Check if all needed directories exist	355	# Check if all needed directories exist
303		356
304	if [ ! -d $HOHOME ]	357	if [ ! -d $HOHOME ]
Lines 309-321 Link Here
309		362
310	if [ ! -d $PLUGINSDIR ]	363	if [ ! -d $PLUGINSDIR ]
311	then	364	then
312	echo "creating $PLUGINSDIR"	365	if [ ! -d $HODIR/hoplugins ]
313	cp -r $HODIR/hoplugins $HOHOME	366	then
		367	echo "creating $HODIR/hoplugins"
		368	mkdir $HOHOME/hoplugins
		369	else
		370	echo "copying $PLUGINSDIR"
		371	cp -r $HODIR/hoplugins $HOHOME
		372	fi
314	fi	373	fi
315		374
316	if [ ! -d $SPRACHDIR ]	375	if [ ! -d $SPRACHDIR ]
317	then	376	then
318	echo "creating $SPRACHDIR"	377	echo "copying $SPRACHDIR"
319	cp -r $HODIR/sprache $HOHOME	378	cp -r $HODIR/sprache $HOHOME
320	fi	379	fi
321		380

Return to bug 90369

Lines 1-8 Link Here

(-)games/hattrickorganizer-136/pkg-plist (-14 / +34 lines)
1	bin/hattrickorganizer	1	bin/hattrickorganizer
2	%%DATADIR%%/HO.bat	2	%%DATADIR%%/HO.bat
3	%%DATADIR%%/HO.sh	3	%%DATADIR%%/HO.sh
		4	%%DATADIR%%/HOLauncher.class
		5	%%DATADIR%%/LICENSELGPL.txt
4	%%DATADIR%%/Logo.ico	6	%%DATADIR%%/Logo.ico
		7	%%DATADIR%%/README_JL.txt
5	%%DATADIR%%/defaults.xml	8	%%DATADIR%%/defaults.xml
		9	%%DATADIR%%/epv.dat
6	%%DATADIR%%/flags/100flag.png	10	%%DATADIR%%/flags/100flag.png
7	%%DATADIR%%/flags/101flag.png	11	%%DATADIR%%/flags/101flag.png
8	%%DATADIR%%/flags/102flag.png	12	%%DATADIR%%/flags/102flag.png
Lines 116-121 Link Here
116	%%DATADIR%%/hoplugins/TrainingExperience.class	120	%%DATADIR%%/hoplugins/TrainingExperience.class
117	%%DATADIR%%/hoplugins/Transfers.class	121	%%DATADIR%%/hoplugins/Transfers.class
118	%%DATADIR%%/hoplugins/commons/plugin.xml	122	%%DATADIR%%/hoplugins/commons/plugin.xml
		123	%%DATADIR%%/hoplugins/commons/sprache/LanguageCodes.properties
		124	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Argentina.properties
119	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Catalan.properties	125	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Catalan.properties
120	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Czech.properties	126	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Czech.properties
121	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Danish.properties	127	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Danish.properties
Lines 130-135 Link Here
130	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Romanian.properties	136	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Romanian.properties
131	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Slovak.properties	137	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Slovak.properties
132	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Spanish.properties	138	%%DATADIR%%/hoplugins/commons/sprache/TeamAnalyzer/Spanish.properties
		139	%%DATADIR%%/hoplugins/commons/sprache/TeamPlanner/English.properties
		140	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Argentina.properties
133	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Catalan.properties	141	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Catalan.properties
134	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Deutsch.properties	142	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Deutsch.properties
135	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/English.properties	143	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/English.properties
Lines 142-147 Link Here
142	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Slovak.properties	150	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Slovak.properties
143	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Spanish.properties	151	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/Spanish.properties
144	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/svenska.properties	152	%%DATADIR%%/hoplugins/commons/sprache/TrainingExperience/svenska.properties
		153	%%DATADIR%%/hoplugins/commons/sprache/Transfers/Argentina.properties
145	%%DATADIR%%/hoplugins/commons/sprache/Transfers/Catalan.properties	154	%%DATADIR%%/hoplugins/commons/sprache/Transfers/Catalan.properties
146	%%DATADIR%%/hoplugins/commons/sprache/Transfers/Deutsch.properties	155	%%DATADIR%%/hoplugins/commons/sprache/Transfers/Deutsch.properties
147	%%DATADIR%%/hoplugins/commons/sprache/Transfers/English.properties	156	%%DATADIR%%/hoplugins/commons/sprache/Transfers/English.properties