Author: cazfi
Date: Thu May  5 17:09:36 2016
New Revision: 32590

URL: http://svn.gna.org/viewcvs/freeciv?rev=32590&view=rev
Log:
Set paths in fcser/fcgui/fcruledit with correct dir separator

See patch #7175

Modified:
    branches/S2_6/bootstrap/fcgui.in
    branches/S2_6/bootstrap/fcruledit.in
    branches/S2_6/bootstrap/fcser.in

Modified: branches/S2_6/bootstrap/fcgui.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/fcgui.in?rev=32590&r1=32589&r2=32590&view=diff
==============================================================================
--- branches/S2_6/bootstrap/fcgui.in    (original)
+++ branches/S2_6/bootstrap/fcgui.in    Thu May  5 17:09:36 2016
@@ -1,5 +1,5 @@
 #!/bin/sh
-#/********************************************************************** 
+#/***********************************************************************
 # Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
 # script by Rene Schalburg
 #   This program is free software; you can redistribute it and/or modify
@@ -52,25 +52,25 @@
 
 if test "x$FREECIV_DATA_PATH" = "x" ; then
   if test "x$FREECIV_PATH" = "x" ; then
-    
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+    
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@@DATASUBDIR@"
   else
     echo "$0: FREECIV_PATH is deprecated"
     FREECIV_DATA_PATH="${FREECIV_PATH}"
   fi
 fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
 export FREECIV_DATA_PATH
 
 if test "x$FREECIV_SAVE_PATH" = "x" ; then
-  FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@~/.freeciv/saves"
+  
FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@saves"
 fi
 
FREECIV_SAVE_PATH="${FREECIV_SAVE_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_PATH_SEPARATOR@@abs_top_srcdir@"
 export FREECIV_SAVE_PATH
 
 if test "x$FREECIV_SCENARIO_PATH" = "x" ; then
-  
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@~/.freeciv/scenarios"
+  
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@@DATASUBDIR@@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@scenarios"
 fi
-FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
+FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios"
 export FREECIV_SCENARIO_PATH
 
 echo "Running $EXE"

Modified: branches/S2_6/bootstrap/fcruledit.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/fcruledit.in?rev=32590&r1=32589&r2=32590&view=diff
==============================================================================
--- branches/S2_6/bootstrap/fcruledit.in        (original)
+++ branches/S2_6/bootstrap/fcruledit.in        Thu May  5 17:09:36 2016
@@ -1,5 +1,5 @@
 #!/bin/sh
-#/********************************************************************** 
+#/***********************************************************************
 # Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
 # script by Rene Schalburg
 #   This program is free software; you can redistribute it and/or modify
@@ -29,13 +29,13 @@
 
 if test "x$FREECIV_DATA_PATH" = "x" ; then
   if test "x$FREECIV_PATH" = "x" ; then
-    
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+    
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@@DATASUBDIR@"
   else
     echo "$0: FREECIV_PATH is deprecated"  
     FREECIV_DATA_PATH="${FREECIV_PATH}"
   fi
 fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
 export FREECIV_DATA_PATH
 
 echo "Running $EXE"

Modified: branches/S2_6/bootstrap/fcser.in
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/bootstrap/fcser.in?rev=32590&r1=32589&r2=32590&view=diff
==============================================================================
--- branches/S2_6/bootstrap/fcser.in    (original)
+++ branches/S2_6/bootstrap/fcser.in    Thu May  5 17:09:36 2016
@@ -1,5 +1,5 @@
 #!/bin/sh
-#/********************************************************************** 
+#/***********************************************************************
 # Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
 # script by Rene Schalburg
 #   This program is free software; you can redistribute it and/or modify
@@ -19,25 +19,25 @@
 
 if test "x$FREECIV_DATA_PATH" = "x" ; then
   if test "x$FREECIV_PATH" = "x" ; then
-    
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@"
+    
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@@DATASUBDIR@"
   else
     echo "$0: FREECIV_PATH is deprecated"
     FREECIV_DATA_PATH="${FREECIV_PATH}"
   fi
 fi
-FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
+FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data"
 export FREECIV_DATA_PATH
 
 if test "x$FREECIV_SAVE_PATH" = "x" ; then
-  FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@~/.freeciv/saves"
+  
FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@saves"
 fi
 
FREECIV_SAVE_PATH="${FREECIV_SAVE_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_PATH_SEPARATOR@@abs_top_srcdir@"
 export FREECIV_SAVE_PATH
 
 if test "x$FREECIV_SCENARIO_PATH" = "x" ; then
-  
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@~/.freeciv/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@~/.freeciv/scenarios"
+  
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@@DATASUBDIR@@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@~@HOST_DIR_SEPARATOR@.freeciv@HOST_DIR_SEPARATOR@scenarios"
 fi
-FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
+FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@@HOST_DIR_SEPARATOR@data@HOST_DIR_SEPARATOR@scenarios"
 export FREECIV_SCENARIO_PATH
 
 [ -x $BUILDDIR/server/$EXENAME ] && EXE=$BUILDDIR/server/$EXENAME


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to