[Freeciv-Dev] (PR#36859) Script for automatic nation inclusion

2007-03-04 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=36859 

 [EMAIL PROTECTED] - Fri Mar 02 22:04:29 2007]:
 
 Made some refactoring for the script (use of temporary files in /tmp/).
 Quite sad that it doesn't work for Daniel.
 
 BR, Daniil.
 
 

With this version, I get a load of ./add_nation: line 37: $tmp1:
ambiguous redirect

This is a pretty old system:
darwin 7.0 (Mac OS X 10.3.9)
perl, v5.8.1-RC3 built for darwin-thread-multi-2level
grep (GNU grep) 2.4.2

Hoping I'll be able to build a state-of-the-art Linux system again soon...

 ~Daniel


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#36859) Script for automatic nation inclusion

2007-03-04 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=36859 

 [EMAIL PROTECTED] - Mon Mar 05 03:02:53 2007]:
 
 Probably, mktemp is not installed on your system.
 
 BR, Daniil.
 
 
 

I believe it is. Here's the full output.

 ~Daniel



output
Description: Binary data
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#36859) Script for automatic nation inclusion

2007-03-01 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=36859 

When I try to use this, I get:

ibg3:~/freeciv daniel$ ./add_nation pirate pirate Tobias Jakobs ~/freeciv
grep: invalid option -- P
Usage: grep [OPTION]... PATTERN [FILE]...
Try `grep --help' for more information.
patching file /Users/daniel/freeciv/data/default/nations.ruleset

etc.

~Daniel

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#36859) Script for automatic nation inclusion

2007-02-24 Thread Daniil Ivanov

URL: http://bugs.freeciv.org/Ticket/Display.html?id=36859 

Hi.

 I made a script which perform automatically nation inclusion.
 The call is done as:
 ./add_nation ruleset_name flag_name flag authors [freeciv root]
 I've tested it on the Belarusian nation and it appears, that
 many files are not in alphabetical order, but the script was able to
 fix it.
 Known shortcoming: there is no way to add nations after Zulu,
 the last available nation. However, this problem is unlikely.

 See attachments for the script and patch, which reflects bugs in
 alphabetical ordering.

Thanks, Daniil.



add_nation
Description: Binary data
Index: data/default/nations.ruleset
===
--- data/default/nations.ruleset	(revision 12694)
+++ data/default/nations.ruleset	(working copy)
@@ -71,6 +71,7 @@
 *include nation/barbarian.ruleset
 *include nation/basque.ruleset
 *include nation/bavarian.ruleset
+*include nation/belarusian.ruleset
 *include nation/belgian.ruleset
 *include nation/bengali.ruleset
 *include nation/boer.ruleset
@@ -162,8 +163,8 @@
 *include nation/numidian.ruleset
 *include nation/nuu-chah-nulth.ruleset
 *include nation/ottoman.ruleset
+*include nation/pakistani.ruleset
 *include nation/papuan.ruleset
-*include nation/pakistani.ruleset
 *include nation/persian.ruleset
 *include nation/peruvian.ruleset
 *include nation/phoenician.ruleset
Index: data/nation/Makefile.am
===
--- data/nation/Makefile.am	(revision 12694)
+++ data/nation/Makefile.am	(working copy)
@@ -25,6 +25,7 @@
 		barbarian.ruleset \
 		basque.ruleset \
 		bavarian.ruleset \
+		belarusian\.ruleset
 		belgian.ruleset \
 		bengali.ruleset \
 		boer.ruleset \
Index: data/misc/shields.spec
===
--- data/misc/shields.spec	(revision 12694)
+++ data/misc/shields.spec	(working copy)
@@ -32,6 +32,7 @@
 		f.shield.bangladesh, flags/bangladesh-shield
 		f.shield.barbarian, flags/barbarian-shield
 		f.shield.bavarian, flags/bavarian-shield
+		f.shield.belarus, flags/belarus-shield
 		f.shield.belgium, flags/belgium-shield
 		f.shield.boer, flags/boer-shield
 		f.shield.bosnia, flags/bosnia-shield
@@ -64,8 +65,8 @@
 		f.shield.europe, flags/europe-shield
 		f.shield.euskadi, flags/euskadi-shield
 		f.shield.finland, flags/finland-shield
+		f.shield.france, flags/france-shield
 		f.shield.france_old, flags/france_old-shield
-		f.shield.france, flags/france-shield
 		f.shield.galicia, flags/galicia-shield
 		f.shield.gaul, flags/gaul-shield
 		f.shield.georgia, flags/georgia-shield
@@ -89,8 +90,8 @@
 		f.shield.innu, flags/innu-shield
 		f.shield.iran_ancient, flags/iran_ancient-shield
 		f.shield.iran, flags/iran-shield
+		f.shield.iraq, flags/iraq-shield
 		f.shield.iraq_old, flags/iraq_old-shield
-		f.shield.iraq, flags/iraq-shield
 		f.shield.ireland, flags/ireland-shield
 		f.shield.iroquois, flags/iroquois-shield
 		f.shield.israel, flags/israel-shield
@@ -124,10 +125,10 @@
 		f.shield.netherlands, flags/netherlands-shield
 		f.shield.newzealand, flags/newzealand-shield
 		f.shield.nigeria, flags/nigeria-shield
+		f.shield.norway, flags/norway-shield
 		f.shield.nubia, flags/nubia-shield
 		f.shield.numidia, flags/numidia-shield
 		f.shield.nuu-chah-nulth, flags/nuu-chah-nulth-shield
-		f.shield.norway, flags/norway-shield
 		f.shield.ottoman, flags/ottoman-shield
 		f.shield.pakistan, flags/pakistan-shield
 		f.shield.palmyra, flags/palmyra-shield
@@ -172,10 +173,10 @@
 		f.shield.tairona, flags/tairona-shield
 		f.shield.taiwan, flags/taiwan-shield
 		f.shield.texas, flags/texas-shield
+		f.shield.thailand, flags/thailand-shield
+		f.shield.thrace, flags/thrace-shield
 		f.shield.tibet, flags/tibet-shield
 		f.shield.tocharian, flags/tocharian-shield
-		f.shield.thailand, flags/thailand-shield
-		f.shield.thrace, flags/thrace-shield
 		f.shield.tunisia, flags/tunisia-shield
 		f.shield.tupi, flags/tupi-shield
 		f.shield.turkey, flags/turkey-shield
Index: data/misc/flags.spec
===
--- data/misc/flags.spec	(revision 12694)
+++ data/misc/flags.spec	(working copy)
@@ -32,6 +32,7 @@
Bangladesh		Cezary Biele
Barbarian		Tobias Jakobs
Bavarian		J├Ârgen Scheibengruber
+   Belarus		Gregory Maxwell and Zachary Harden
Belgium		Daniel McRae
Boer			Caleb Moore
Bosnia		Daniel McRae
@@ -215,6 +216,7 @@
 		f.bangladesh, flags/bangladesh
 		f.barbarian, flags/barbarian
 		f.bavarian, flags/bavarian
+		f.belarus, flags/belarus
 		f.belgium, flags/belgium
 		f.boer, flags/boer			; old south african
 		f.bosnia, flags/bosnia
@@ -247,8 +249,8 @@
 		f.europe, flags/europe
 		f.euskadi, flags/euskadi
 		f.finland, flags/finland
+		f.france, flags/france
 		f.france_old, flags/france_old	; alt Gallic
-		f.france, flags/france
 		f.galicia, flags/galicia
 		f.gaul, flags/gaul
 		f.georgia, flags/georgia
@@