Merge pull request #14 from muonium/deploy_branch

Deploy branch
muonium · Feb 16, 2018 · acb2289 · acb2289
2 parents 23a2b76 + c7c8212
commit acb2289
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/deployNewVersion.php b/deployNewVersion.php
@@ -1,6 +1,7 @@
 <?php
 if(!empty($_POST)) {
-    $output = shell_exec(dirname(__DIR__) . '/deploy.sh --release 2>&1');
+    $branch = $_POST['branch'];
+    $output = shell_exec(dirname(__DIR__) . '/deploy.sh --release "'.$branch.'" 2>&1');
     $error = $output;
     $message = "New version deployed.";
 }
@@ -36,6 +37,12 @@
         <form action="./deployNewVersion.php" method="post">
             <fieldset>
                 <legend>Deploy new version</legend>
+                <div>
+                    <label for="branch">Branch</label>  
+                    <div>
+                        <input id="branch" name="branch" type="text" placeholder="Branch">
+                    </div>
+                </div>
                 <div>
                     <button type="submit" id="deployButton" name="deployButton">Deploy</button>
                     <a href="/panel">Get back to the panel</a>

diff --git a/updatePanel.php b/updatePanel.php
@@ -1,6 +1,7 @@
 <?php
 if(!empty($_POST)) {
-    $output = shell_exec(dirname(__DIR__) . '/deploy.sh --panel 2>&1');
+    $branch = $_POST['branch'];
+    $output = shell_exec(dirname(__DIR__) . '/deploy.sh --panel "'.$branch.'" 2>&1');
     $error = $output;
     $message = "New version of admin panel deployed.";
 }
@@ -36,6 +37,12 @@
         <form action="./updatePanel.php" method="post">
             <fieldset>
                 <legend>Update Admin panel</legend>
+                <div>
+                    <label for="branch">Branch</label>  
+                    <div>
+                        <input id="branch" name="branch" type="text" placeholder="Branch">
+                    </div>
+                </div>
                 <div>
                     <button type="submit" id="updatePanelButton" name="updatePanelButton">Update</button>
 					<a href="/panel">Get back to the panel</a>