chore(ci): updating CI scripts

scripts/config.json

@@ -1,5 +1,5 @@
 {
   "sitePath": "../ionic-site",
-  "v2DocsDir": "content/docs/v2/native",
+  "v2DocsDir": "docs/v2/native",
   "docsDest": "../ionic-site/content/docs/v2/native"
 }

scripts/docs/dgeni-config.js

@@ -85,7 +85,7 @@ module.exports = function(currentVersion) {
     // We don't separate by versions so always put the docs in the root
     var folder = '';
     return {
-      href: path.join('/' + config.v2DocsDir, folder),
+      href: '/' + config.v2DocsDir.replace('content/',''),
       folder: folder,
       name: version
     };
@@ -99,12 +99,11 @@ module.exports = function(currentVersion) {
 
   renderDocsProcessor.extraData.version = versionData;
   renderDocsProcessor.extraData.versionInfo = versionInfo;
-
   computePathsProcessor.pathTemplates = [{
     docTypes: ['class', 'var', 'function', 'let'],
     getOutputPath: function(doc) {
       var docPath = doc.name + '/index.md';
-      var path = config.v2DocsDir + '/' +  docPath;
+      var path = 'content/' + config.v2DocsDir + '/' +  docPath;
 
       return path;
     }

scripts/docs/processors/jekyll.js

@@ -19,14 +19,15 @@ module.exports = function jekyll(renderDocsProcessor) {
       docs.forEach(function(doc, i) {
         doc.outputPath = doc.outputPath.toLowerCase().replace(' ', '-');
         docs[i].URL = doc.outputPath.replace('docs/v2//', 'docs/v2/')
-                                    .replace('/index.md', '');
+                                    .replace('/index.md', '')
+                                    .replace('content/','');
       });
 
       docs.push({
         docType: 'native_menu-menu',
         id: 'native_menu-menu',
         template: 'native_menu.template.html',
-        outputPath: '_includes/v2_fluid/native_menu.html'
+        outputPath: 'content/_includes/v2_fluid/native_menu.html'
       });
 
       // returning docs will replace docs object in the next process

scripts/docs/templates/common.template.html

@@ -1,7 +1,7 @@
 ---
 layout: "v2_fluid/docs_base"
 version: "<$ version.current.name $>"
-versionHref: "<$ version.current.href $>"
+versionHref: "<$ version.current.href.replace('content/','') $>"
 path: "<$ doc.path $>"
 category: native
 id: "<$ doc.name|lower|replace(' ','-') $>"

scripts/docs/update_docs.sh

@@ -24,7 +24,8 @@ function run {
   cd $SITE_DIR
 
   # if no changes, don't commit
-  if ! git diff-index --quiet HEAD --
+  CHANGED=$(git diff-index --name-only HEAD --)
+  if [ -z "$CHANGED" ];
   then
     echo "-- No changes detected for the following commit, docs not updated."
     echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"

src/plugins/actionsheet.ts

@@ -47,7 +47,7 @@ export interface ActionSheetOptions {
 /**
  * @name Action Sheet
  * @description
- * The ActionSheet plugin shows a native list of options the user can pick.
+ * The ActionSheet plugin shows a native list of options the user can choose from.
  *
  * Requires Cordova plugin: `cordova-plugin-actionsheet`. For more info, please see the [ActionSheet plugin docs](https://github.com/EddyVerbruggen/cordova-plugin-actionsheet).
  *