[PC-BSD Commits] r198 - pcbsd/trunk/PCInstall

[svn at pcbsd.org]

Author: tim
Date: 2007-04-26 18:44:28 +0100 (Thu, 26 Apr 2007)
New Revision: 198

Modified:
   pcbsd/trunk/PCInstall/pcinstall.ui
   pcbsd/trunk/PCInstall/pcinstall.ui.h
Log:
Fixed location of Bash.

Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui	2007-04-25 18:00:52 UTC (rev 197)
+++ pcbsd/trunk/PCInstall/pcinstall.ui	2007-04-26 17:44:28 UTC (rev 198)
@@ -2539,39 +2539,6 @@
                     <string>Shell:</string>
                 </property>
             </widget>
-            <widget class="QComboBox">
-                <item>
-                    <property name="text">
-                        <string>/bin/csh</string>
-                    </property>
-                </item>
-                <item>
-                    <property name="text">
-                        <string>/bin/tcsh</string>
-                    </property>
-                </item>
-                <item>
-                    <property name="text">
-                        <string>/bin/sh</string>
-                    </property>
-                </item>
-                <item>
-                    <property name="text">
-                        <string>/bin/bash</string>
-                    </property>
-                </item>
-                <property name="name">
-                    <cstring>comboShell</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>90</x>
-                        <y>100</y>
-                        <width>160</width>
-                        <height>31</height>
-                    </rect>
-                </property>
-            </widget>
             <widget class="QPushButton">
                 <property name="name">
                     <cstring>pushAddUser</cstring>
@@ -2747,6 +2714,39 @@
                     </rect>
                 </property>
             </widget>
+            <widget class="QComboBox">
+                <item>
+                    <property name="text">
+                        <string>/bin/csh</string>
+                    </property>
+                </item>
+                <item>
+                    <property name="text">
+                        <string>/bin/tcsh</string>
+                    </property>
+                </item>
+                <item>
+                    <property name="text">
+                        <string>/bin/sh</string>
+                    </property>
+                </item>
+                <item>
+                    <property name="text">
+                        <string>/usr/local/bin/bash</string>
+                    </property>
+                </item>
+                <property name="name">
+                    <cstring>comboShell</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>90</x>
+                        <y>100</y>
+                        <width>160</width>
+                        <height>31</height>
+                    </rect>
+                </property>
+            </widget>
         </widget>
         <widget class="QGroupBox">
             <property name="name">
@@ -8893,7 +8893,6 @@
 <slots>
     <slot>PageChangedSlot( const QString &amp; Page )</slot>
     <slot>ChangeLicAgreeSlot( bool clicked )</slot>
-    <slot>accept()</slot>
     <slot access="private">CheckAccountInfo()</slot>
     <slot access="private">passwordTextChanged( const QString &amp; Text )</slot>
     <slot>reject()</slot>
@@ -8951,6 +8950,7 @@
     <slot access="private">changePromoAd()</slot>
     <slot access="private">checkVmwareSystemSlot()</slot>
     <slot access="private">listBoxLayoutChanged()</slot>
+    <slot>accept()</slot>
 </slots>
 <functions>
     <function>ProgramInit()</function>

Modified: pcbsd/trunk/PCInstall/pcinstall.ui.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-04-25 18:00:52 UTC (rev 197)
+++ pcbsd/trunk/PCInstall/pcinstall.ui.h	2007-04-26 17:44:28 UTC (rev 198)
@@ -555,7 +555,7 @@
     } else if ( comboShell->currentItem() == 2) {
 	AddShell[i] = "/bin/sh";
     } else {
-	AddShell[i] = "/bin/bash";
+	AddShell[i] = "/usr/local/bin/bash";
     }
  
 
@@ -2931,7 +2931,7 @@
 	    comboShell->setCurrentItem(1);
 	} else if(AddShell[i] == "/bin/sh") {
 	    comboShell->setCurrentItem(2);
-	} else if(AddShell[i] == "/bin/bash") {
+	} else if(AddShell[i] == "/usr/local/bin/bash") {
 	    comboShell->setCurrentItem(3);
 	}
 	
@@ -2962,7 +2962,7 @@
     } else if ( comboShell->currentItem() == 2) {
 	AddShell[i] = "/bin/sh";
     } else {
-	AddShell[i] = "/bin/bash";
+	AddShell[i] = "/usr/local/bin/bash";
     }