Changeset 27715
- Timestamp:
- 2013-06-27T16:55:49+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java
r27674 r27715 150 150 sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: import collection.")); 151 151 Vector<String> command = new Vector<String>(); 152 command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl"); 152 153 String perlPath = GlobalProperties.getProperty("perl.path", "perl"); 154 if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar) 155 { 156 perlPath = perlPath + File.separator; 157 } 158 159 command.add(perlPath + "perl"); 153 160 command.add("-S"); 154 161 command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "import.pl"); … … 179 186 sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: build collection.")); 180 187 Vector<String> command = new Vector<String>(); 181 command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl"); 188 189 String perlPath = GlobalProperties.getProperty("perl.path", "perl"); 190 if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar) 191 { 192 perlPath = perlPath + File.separator; 193 } 194 195 command.add(perlPath + "perl"); 182 196 command.add("-S"); 183 197 command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "buildcol.pl"); … … 242 256 // sucessfully consistently during testing, whereas java at times is unable to delete it. 243 257 Vector<String> command = new Vector<String>(); 244 command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl"); 258 259 String perlPath = GlobalProperties.getProperty("perl.path", "perl"); 260 if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar) 261 { 262 perlPath = perlPath + File.separator; 263 } 264 265 command.add(perlPath + "perl"); 245 266 command.add("-S"); 246 267 command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "activate.pl");
Note:
See TracChangeset
for help on using the changeset viewer.