Changeset 22496

Timestamp:

2010-07-26T11:32:05+12:00 (13 years ago)

Author:

davidb

Message:

Work out name of extension rather than use hard-wired name

File:

• gs2-extensions/open-office/trunk/setup.bat (modified) (2 diffs)

gs2-extensions/open-office/trunk/setup.bat

@@ -2 +2 @@
 pushd "%CD%"
 CD /D "%~dp0"
-set GSDLLANG=en
+
 set extdesc=the OpenOffice Extension
 
@@ -34 +34 @@
 :Success
 
+set fulldir=%~dp0
+
+:: strip off everything up to (and including) ext dir
+set extdir=%fulldir:*ext\=%
+
+:: remove trailing slash
+set extdir=%extdir:\=%
+
 if "x%GSDLEXTS%" == "x" (
-  set GSDLEXTS=open-office
+  set GSDLEXTS=%extdir%
 ) else (
-  set GSDLEXTS=%GSDLEXTS%:open-office
+  set GSDLEXTS=%GSDLEXTS%:%extdir%
 )
 
 echo +Your environment is now setup for %extdesc%
 
+:: Back to delayed expansion to avoid problems with environment
+:: variables with brackets in them, such as "Program Files (x86)"
+
+
 :End