Merge pull request #102 from pirog/80-password-prompt-no-timeout

80 password prompt no timeout

kalabox/installer/installer.js

@@ -253,6 +253,11 @@ var installDMG = flow('installDMG')(
  * Route handler that installs Kalabox.
  */
 var install = flow('installKalabox')(
+  // use -k here because if you've previous entered sudo and are under timeout
+  // it will do weird things and you could enter in a wrong password
+  function installResetPassword() {
+    exec('sudo -k', this.async());
+  },
   // Get asking for the user's password out of the way.
   function installGetPassword() {
     sudoRunner.runCommand('echo', ['We needs the passwordz...'], this.async());

kalabox/utils/task-runner/sudo-pass.scpt

@@ -1,16 +1,18 @@
 set kalaicon to 2
 tell application "System Events" to set itExists to ¬
-  exists of alias ((path to me as text) & ":app.icns")
+  exists of alias ((path to me as text) & ":..:..:..:..:app.icns")
 if itExists
-  set kalaicon to alias ((path to me as text) & ":app.icns")
+  set kalaicon to alias ((path to me as text) & ":..:..:..:..:app.icns")
 end if
+with timeout of 86400 seconds
 tell application "SystemUIServer"
   activate
   set my_password to display dialog ¬
     "Please enter your Mac user account password. Installation will fail if your account does not have administrative privileges." with title ¬
     "Password" with icon kalaicon ¬
     default answer ¬
     "" buttons {"Cancel", "OK"} default button 2 ¬
-    giving up after 295 ¬
+    giving up after 86400 ¬
     with hidden answer
 end tell
+end timeout

views/permission_denied.ejs

@@ -1,9 +1,23 @@
-<div class="kalawrap">
-
-  <h1>You Don't Trust <em>US</em>?</h1>
-
-  <p>You didn't give us permission to download a Kalabox dependency. Unfortunately, this means no Kalabox for you. If you change your mind, re-run the installer and we'll welcome you back with open arms.</p>
+<div class="start kalawrap">
+  <hr>
+  <div class="kalatron">
+    <h1>:( Try Again?</h1>
+    <p id="info" class="lead">Kalabox mixes VirtualBox and Vagrant into
+      its hot bubbling cauldron of Deep Dark Magic. However, Kalabox
+      wouldn't dare brew this stew without the express virtual consent
+      of you the user. Ergo, click below and let's make this baby go!*</p>
+    <a class="btn btn-large btn-success btn-massive" href="install">Box me</a>
 
+  </div>
+  <hr>
+  <p>
+    <small>* To be 100% explicit if you click the button you agree to
+      the download and installation of <a target="_blank"
+      href="https://www.virtualbox.org/">VirtualBox</a> and <a
+      target="_blank" href="http://www.vagrantup.com/">Vagrant</a><a
+      href="dash">.</a>
+    </small>
+  </p>
 </div>
 
 <script src="/js/errors.js"></script>