Reverted this nonsense

gantry · Oct 11, 2016 · 49193ae · 49193ae
1 parent e3371f1
commit 49193ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,14 +22,13 @@ env:
     - secure: "GIFHCpRBw07hm/RwDUbeh1EZS3nUCRFnsAhyeBm02a5dKbCCIrAUoI5HVjTPyFiG/UKaRo3u/7byA3ROmXgVE48Hg5n4E3+ga8zOwdRdXql7V6pwu4bII4Kr+4qFgIDkn8ca1Ut1bxKQZI/NP/FR73pZ/pst/rtw27M4Au/PZSHAtAkMF1KSqcRSfvggAtqnhh3xFTFx13XvakX7zpP1AyD1Yft4dHhhZN+BHTxQgRrl+fJLky1MAwIwOl1xOF1VH+RQDdh3yXLHMfbznTjdeE9vJCiEjnZPUgZ+aXusLj1bJoNgrRNVCCikrOMLFK854YxxzGuzRtN/6xhcB/8LeFypw8jhHNnswJ5TX8heB7i4Jbu/7OTCk5/Ew0uG6kveTtvWsAOmVZZAqSl4Z/hZowCAavXy2X1DmZpsjQ0ljxZC271a5UQpI5HF7EKVoFhzvxyxZrxlUYSSDFTOoNGauKvsZbtgz6A0eAQOpjtuWXRTYnbxsOEZFuZCuOwUU6EdDtSA0RIpxnUI3qwn26+GzGTaaxjwTQ+ZtytmHaddC3jgKZ9EfZB6yOUeXXdnI+h0coSR8lp4yjOU/ZWnA9n96+fMqwnR5zCbxJeErhI8RJFWJL1/so1k0wq3t4OixVjDGY1rJkkugD8AnIUEPgB/gfGtF5t6J4WGrpFhWzej9/c="
 before_install:
   - composer self-update
-  - npm install -g yarn
   - if [ ! -z "$TRAVIS_TAG" ]; then
       gem install sass;
-      yarn global install gulp;
+      npm install -g gulp;
     fi
 install:
   - if [ ! -z "$TRAVIS_TAG" ]; then
-      yarn install;
+      npm install;
       gulp -up;
     fi
   - cd $TRAVIS_BUILD_DIR/src/platforms/joomla && composer install --no-dev;

diff --git a/bin/build/build.xml b/bin/build/build.xml
@@ -89,17 +89,17 @@
         <trycatch>
             <try>
                 <!-- Fail the build if npm is not installed -->
-                <exec command="yarn --version" checkreturn="true" passthru="true" output="/dev/null" />
+                <exec command="npm -v" checkreturn="true" passthru="true" output="/dev/null" />
             </try>
             <catch>
-                <fail message="Please install Yarn Package Manager" />
+                <fail message="Please install Node Package Manager" />
             </catch>
         </trycatch>
 
         <trycatch>
             <try>
                 <!-- Fail the build if gulp is not installed -->
-                <exec command="yarn ls gulp|grep gulp" checkreturn="true" passthru="true" output="/dev/null" />
+                <exec command="npm list -g gulp|grep gulp" checkreturn="true" passthru="true" output="/dev/null" />
             </try>
             <catch>
                 <echo message="Please install Gulp globally" />

diff --git a/gulpfile.js b/gulpfile.js
@@ -24,10 +24,10 @@ if (process.argv.slice(2).join(',').match(/(-{1,2}update|-{1,2}up|-{1,2}install|
 
             try { exists = fs.lstatSync(nodes).isDirectory(); }
             catch (e) {}
-            if (exists) { method = 'upgrade'; }
+            if (exists) { method = 'update --save --save-dev'; }
 
-            console.log((exists ? 'Upgrading' : "Installing") + " JS dependencies in: " + path);
-            child = exec('cd ' + path + ' && yarn ' + method, // + ' --silent',
+            console.log((exists ? 'Updating' : "Installing") + " JS dependencies in: " + path);
+            child = exec('cd ' + path + ' && npm ' + method + ' --silent',
                 function(error, stdout, stderr) {
                     if (stdout) { console.log('Completed `' + path + '`:', "\n", stdout); }
                     if (stderr) { console.log('Error `' + path + '`:' + stderr); }