[Cgui-develop] cgui fix.sh,1.1.1.1.2.1.2.3,1.1.1.1.2.1.2.4

[Christer S. <ch...@us...>]

Update of /cvsroot/cgui/cgui
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32614

Modified Files:
      Tag: Branch_CGUI_1-6-7
	fix.sh 
Log Message:
Fixed bug 3145026; Fixed problem with handling of line endings in unix script

Index: fix.sh
===================================================================
RCS file: /cvsroot/cgui/cgui/fix.sh,v
retrieving revision 1.1.1.1.2.1.2.3
retrieving revision 1.1.1.1.2.1.2.4
diff -C2 -d -r1.1.1.1.2.1.2.3 -r1.1.1.1.2.1.2.4
*** fix.sh	8 Nov 2005 08:30:43 -0000	1.1.1.1.2.1.2.3
--- fix.sh	26 Dec 2010 11:50:20 -0000	1.1.1.1.2.1.2.4
***************
*** 22,29 ****
     echo "  --mtou      Convert from Macintosh to Unix format"
     echo "  --ttos      Convert tabs to 3 spaces int c-files"
!    echo "If no parameter is specified, --dtou is assumed."
!    echo
! 
!    CGUI_NOCONV="1"
  }
  
--- 22,27 ----
     echo "  --mtou      Convert from Macintosh to Unix format"
     echo "  --ttos      Convert tabs to 3 spaces int c-files"
!    echo ""
!    LINE_ENDING_CONVERSION="0";
  }
  
***************
*** 39,49 ****
  }
  
- proc_noexist()
- {
-    echo "Sorry, CGUI has not been ported to $1."
-    echo "Want to help?"
-    CGUI_NOCONV="1"
- }
- 
  proc_filelist()
  {
--- 37,40 ----
***************
*** 131,136 ****
  }
  
! # prepare CGUI for the given platform.
  
  case "$1" in
     "djgpp"   ) proc_fix     "DOS (djgpp)"       "makefile.dj";;
--- 122,132 ----
  }
  
! if [ $# -gt 1 ]; then
!    LINE_ENDING_CONVERSION="1";
! else
!    LINE_ENDING_CONVERSION="0";
! fi;
  
+ # prepare CGUI for the given platform.
  case "$1" in
     "djgpp"   ) proc_fix     "DOS (djgpp)"       "makefile.dj";;
***************
*** 146,150 ****
  # convert all text-file line endings.
  
! if [ "$CGUI_NOCONV" != "1" ]; then
     case "$2" in
        "--utod"  ) proc_utod;;
--- 142,146 ----
  # convert all text-file line endings.
  
! if [ "$LINE_ENDING_CONVERSION" -eq "1" ]; then
     case "$2" in
        "--utod"  ) proc_utod;;
***************
*** 154,163 ****
        "--ttos"  ) proc_ttos;;
        "--quick" ) echo "No text file conversion...";;
!       *         ) if [ "$1" != "mac" ]; then
!                      proc_utod
!                   else
!                      proc_utom
!                   fi;;
!    esac
  fi
  
--- 150,155 ----
        "--ttos"  ) proc_ttos;;
        "--quick" ) echo "No text file conversion...";;
!       *         ) if [ "$1" == "mac" ]; then proc_utom; fi;;
!    esac;
  fi