gnue/gnuef doc/installer/gfclient.iss src/GFCli...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/15 16:46:23

Modified files:
        gnuef/doc/installer: gfclient.iss 
        gnuef/src      : GFClient.py 

Log message:
        fixed Inno install to start Intro form

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/doc/installer/gfclient.iss.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFClient.py.diff?cvsroot=OldCVS&tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: gnue/gnuef/doc/installer/gfclient.iss
diff -u gnue/gnuef/doc/installer/gfclient.iss:1.5 
gnue/gnuef/doc/installer/gfclient.iss:1.6
--- gnue/gnuef/doc/installer/gfclient.iss:1.5   Tue Nov 13 23:12:08 2001
+++ gnue/gnuef/doc/installer/gfclient.iss       Thu Nov 15 16:46:23 2001
@@ -41,20 +41,22 @@
 Source: "h:\cvs\gnue\gnuef\samples\*.gfd"; DestDir: "{app}\..\Samples\forms\"; 
Flags: recursesubdirs; Components: samples
 Source: "h:\cvs\gnue\gnuef\samples\*.sql"; DestDir: "{app}\..\Samples\forms\"; 
Flags: recursesubdirs; Components: samples
 Source: "h:\cvs\gnue\gnuef\samples\README.*"; DestDir: 
"{app}\..\Samples\forms\"; Flags: recursesubdirs; Components: samples
+Source: "h:\cvs\gnue\gnuef\samples\*.gfd"; DestDir: "{app}\..\Samples\forms\"; 
Flags: recursesubdirs; Components: samples
+Source: "h:\cvs\gnue\gnuef\samples\Intro\*.gfd"; DestDir: 
"{app}\..\Samples\forms\Intro"; Components: main
 
 [Dirs]
 Name: {app}\..\etc; Components: main
 Name: {app}\..\shared\images; Components: main
-Name: {app}\..\Samples\forms; Components: samples
+Name: {app}\..\Samples\forms\Intro; Components: main
 Name: {app}\doc; Components: doc
 
 [INI]
 Filename: "{app}\gfclient.url"; Section: "InternetShortcut"; Key: "URL"; 
String: "http://www.gnuenterprise.org";
 
 [Icons]
-Name: "{group}\GNUe Forms Client"; Filename: "{app}\gfclient.exe"
+Name: "{group}\GNUe Forms Client"; Filename: 
"{app}\..\Samples\forms\Intro\intro.gfd"
 Name: "{group}\GNUe Forms Client on the Web"; Filename: "{app}\gfclient.url"
-Name: "{userdesktop}\GNUe Forms Client"; Filename: "{app}\gfclient.exe"; 
WorkingDir: "{app}"; MinVersion: 4,4; Tasks: desktopicon
+Name: "{userdesktop}\GNUe Forms Client"; Filename: 
"{app}\..\Samples\forms\Intro\intro.gfd"; WorkingDir: "{app}"; MinVersion: 4,4; 
Tasks: desktopicon
 
 [UninstallDelete]
 Type: files; Name: "{app}\gfclient.url"
Index: gnue/gnuef/src/GFClient.py
diff -u gnue/gnuef/src/GFClient.py:1.30 gnue/gnuef/src/GFClient.py:1.31
--- gnue/gnuef/src/GFClient.py:1.30     Wed Nov 14 12:56:10 2001
+++ gnue/gnuef/src/GFClient.py  Thu Nov 15 16:46:23 2001
@@ -86,9 +86,12 @@
     try:
       formfile = self.ARGUMENTS[0]
     except:
-      if sys.argv[0][-11:] != 'GFClient.py':
-        formfile = 
os.environ['INSTALL_PREFIX']+'/'+GConfig.get('FormDir')+"/"+os.path.basename(sys.argv[0])+".gfd"
-      else:
+      try:
+        if string.split(string.lower(os.path.basename(sys.argv[0])),'.')[0] != 
'gfclient':
+          formfile = 
os.environ['INSTALL_PREFIX']+'/'+GConfig.get('FormDir')+"/"+os.path.basename(sys.argv[0])+".gfd"
+        else: 
+          raise IndexError
+      except IndexError: 
         self.handleStartupError ("No Forms Definition File Specified.")