[Scummvm-git-logs] scummvm-web master -> a4f9914c2beec20ec3be9f154cbf4300e1f862b3

Mon Jul 30 17:53:30 CEST 2018

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
a4f9914c2b BUILD: Update dependencies and tweak the site-update script


Commit: a4f9914c2beec20ec3be9f154cbf4300e1f862b3
    https://github.com/scummvm/scummvm-web/commit/a4f9914c2beec20ec3be9f154cbf4300e1f862b3
Author: Matan Bareket (mataniko at gmail.com)
Date: 2018-07-29T22:00:47-04:00

Commit Message:
BUILD: Update dependencies and tweak the site-update script

Changed paths:
    composer.lock
    site-update/index.php
    site-update/install.sh

diff --git a/composer.lock b/composer.lock
index 83804fd..d36ea58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b3beee70c2e326b0c5f59e77a519ed7f",
+    "content-hash": "b5db5e6acc4caf11fd6f16c7ebbebb4d",
     "packages": [
         {
             "name": "leafo/scssphp",
-            "version": "v0.7.6",
+            "version": "v0.7.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/leafo/scssphp.git",
-                "reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794"
+                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/leafo/scssphp/zipball/585f6ae84de62ffecf69c23805f25d78d7e4b794",
-                "reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794",
+                "url": "https://api.github.com/repos/leafo/scssphp/zipball/1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
+                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
                 "shasum": ""
             },
             "require": {
@@ -56,7 +56,7 @@
                 "scss",
                 "stylesheet"
             ],
-            "time": "2018-05-24T02:18:53+00:00"
+            "time": "2018-07-22T01:22:08+00:00"
         },
         {
             "name": "smarty/smarty",
diff --git a/site-update/index.php b/site-update/index.php
index 2d3baaf..7abe8f5 100644
--- a/site-update/index.php
+++ b/site-update/index.php
@@ -1,9 +1,29 @@
 <html>
-<body>
-<pre>
-<?php  
-  echo shell_exec('sh install.sh');
-?>
-</pre>
-</body>
+  <head>
+    <style>
+      body {
+        background: black;
+      }
+      pre {
+        font-family: monospace, monospace;
+        font-size: 1em;		
+        color: #00FF33;
+      }
+    </style>
+  </head>
+  <body>
+    <pre>
+    <?php  
+      while (@ ob_end_flush()); // end all output buffers if any
+
+      $proc = popen('sh install.sh', 'r');
+
+      while (!feof($proc))
+      {
+          echo fread($proc, 4096);
+          @ flush();
+      }
+    ?>
+    </pre>
+  </body>
 </html>
diff --git a/site-update/install.sh b/site-update/install.sh
index b88d502..01178c2 100644
--- a/site-update/install.sh
+++ b/site-update/install.sh
@@ -10,12 +10,14 @@ echo '$ git status'
 git status
 
 # Generate image sprite
+echo 'Generating games and platforms sprites'
 glue images/icons/games/ --img=images/ --scss=scss/sprites/ --retina
 glue images/icons/platforms/ --img=images/ --scss=scss/sprites/ --retina
 mv scss/sprites/games.scss scss/sprites/_games.scss
 mv scss/sprites/platforms.scss scss/sprites/_platforms.scss
 
 # Create a css folder if it doesn't exist
+echo "Checking CSS folder"
 if [ ! -d "css" ]; then
   echo "$ mkdir css"
   mkdir css
@@ -23,15 +25,16 @@ fi
 
 # Run composer install
 export COMPOSER_HOME=/var/www/composer
-echo "$ Composer home:" $COMPOSER_HOME
+echo "Composer home:" $COMPOSER_HOME
 echo '$ composer install'
 composer install 2>&1
  
 # Run npm install
 echo "$ npm install"
-npm install
+npm install 2>&1
 
 # Set up smarty 3
+echo "Checking smarty template folder"
 if [ -d "vendor/smarty/smarty/libs" ] && [ ! -d "vendor/smarty/smarty/libs/template_c" ]; then
   echo "$ mkdir vendor/smarty/smarty/libs/template_c"
   mkdir vendor/smarty/smarty/libs/template_c



