Changeset 4400

Timestamp:

Jun 19, 2014, 6:58:21 PM (10 years ago)

Author:

ldelgass

Message:

Merge builder path fix from 1.3 branch

File:

• trunk/builder/scripts/main.tcl (modified) (1 diff)

trunk/builder/scripts/main.tcl

@@ -868 +868 @@
 
                 # /apps/rappture/current for 32-bit systems
-                # /apps/share64/rappture/current for 64-bit systems
-                if {$tcl_platform(wordSize) == 8
-                      && [file isdirectory /apps/share64/rappture/current]} {
-                    set dir /apps/share64/rappture/current
+                if {$tcl_platform(wordSize) == 8 } {
+                     if { [file isdirectory /apps/share64/debian7/rappture/current]} {
+                        set dir /apps/share64/debian7/rappture/current
+                     } elseif { [file isdirectory /apps/share64/debian6/rappture/current]} {
+                        set dir /apps/share64/debian6/rappture/current
+                     } else {
+                        set dir /apps/rappture/current
+                     }
                 } else {
                     set dir /apps/rappture/current