From b309961edb1c5420a24df102cad37af31e737f7d Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Fri, 30 Sep 2016 09:42:53 +0100 Subject: [PATCH] fix clean script, remove typing folder and install rimraf if is not present --- demo-shell-ng2/package.json | 2 +- ng2-components/ng2-activiti-analytics/package.json | 2 +- ng2-components/ng2-activiti-processlist/package.json | 2 +- ng2-components/ng2-activiti-tasklist/package.json | 2 +- ng2-components/ng2-alfresco-core/package.json | 2 +- ng2-components/ng2-alfresco-datatable/package.json | 2 +- .../ng2-alfresco-documentlist/package.json | 2 +- ng2-components/ng2-alfresco-login/package.json | 2 +- ng2-components/ng2-alfresco-search/package.json | 2 +- ng2-components/ng2-alfresco-tag/package.json | 2 +- ng2-components/ng2-alfresco-upload/package.json | 2 +- ng2-components/ng2-alfresco-viewer/package.json | 2 +- ng2-components/ng2-alfresco-webscript/package.json | 2 +- scripts/npm-build-all.sh | 10 +++++----- scripts/npm-check.sh | 6 +++--- scripts/npm-clean.sh | 6 +++--- scripts/npm-link-demo-shell.sh | 4 ++-- scripts/npm-publish.sh | 6 +++--- scripts/update-version.sh | 12 ++++++------ 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 02596c56c8..1f814e82e2 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -4,7 +4,7 @@ "version": "0.3.0", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && npm run tsc && npm run licensecheck", "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run serve\" ", "aws": "node app.js", diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 11a5f10465..4aaaa27d11 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -4,7 +4,7 @@ "version": "0.3.3", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index 1548f6ec60..2b2dc0a279 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index fa5db60f9a..bb2874af27 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -4,7 +4,7 @@ "version": "0.3.3", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index e10eb34aa5..b21bcb3b7e 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && tsc && npm run copy-dist:w && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 68d2522f5e..2180c268b1 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 9be52e9c39..e4953833ce 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 2ea3f51c65..79ef9f8954 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 7d309afb34..cb24eaa3fb 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 5ba01e52db..b4e3296af3 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -6,7 +6,7 @@ "main": "./dist/index.js", "typings": "./dist/index.d.ts", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 1829ab4220..cd32832b64 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index 6966a0ca6c..934d687704 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -4,7 +4,7 @@ "version": "0.3.2", "author": "Alfresco Software, Ltd.", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 61687be08d..e6b623638d 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -6,7 +6,7 @@ "main": "./dist/index.js", "typings": "./dist/index.d.ts", "scripts": { - "clean": "rimraf dist node_modules", + "clean": "npm install rimraf && rimraf dist node_modules typings", "build": "npm run tslint && rimraf dist && tsc && npm run copy-dist && license-check", "build:w": "npm run tslint && rimraf dist && npm run watch-task", "watch-task": "concurrently \"npm run tsc:w\" \"npm run copy-dist:w\" \"license-check\"", diff --git a/scripts/npm-build-all.sh b/scripts/npm-build-all.sh index 82e07b5bbf..55d3310667 100755 --- a/scripts/npm-build-all.sh +++ b/scripts/npm-build-all.sh @@ -11,19 +11,19 @@ build_project() { } for PACKAGE in \ - ng2-alfresco-core \ + ng2-activiti-analytics \ ng2-activiti-form \ - ng2-activiti-tasklist \ ng2-activiti-processlist \ + ng2-activiti-tasklist \ + ng2-alfresco-core \ ng2-alfresco-datatable \ ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ + ng2-alfresco-tag \ ng2-alfresco-upload \ ng2-alfresco-viewer \ - ng2-alfresco-webscript \ - ng2-alfresco-tag \ - ng2-activiti-analytics + ng2-alfresco-webscript do DESTDIR="$DIR/../ng2-components/${PACKAGE}" build_project $DESTDIR $PACKAGE diff --git a/scripts/npm-check.sh b/scripts/npm-check.sh index 43dcbc99f3..e98fea6553 100755 --- a/scripts/npm-check.sh +++ b/scripts/npm-check.sh @@ -7,6 +7,7 @@ npm install -g npm-check echo 'start' > ../check-dependecies.log for PACKAGE in \ + ng2-activiti-analytics \ ng2-activiti-form \ ng2-activiti-processlist \ ng2-activiti-tasklist \ @@ -15,11 +16,10 @@ for PACKAGE in \ ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ + ng2-alfresco-tag \ ng2-alfresco-upload \ ng2-alfresco-viewer \ - ng2-alfresco-webscript \ - ng2-alfresco-tag \ - ng2-activiti-analytics + ng2-alfresco-webscript do echo "====== Check component: ${PACKAGE} =====" cd "$DIR/../ng2-components/${PACKAGE}" diff --git a/scripts/npm-clean.sh b/scripts/npm-clean.sh index 46f6ee8159..557d336dbf 100755 --- a/scripts/npm-clean.sh +++ b/scripts/npm-clean.sh @@ -3,6 +3,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" for PACKAGE in \ + ng2-activiti-analytics \ ng2-activiti-form \ ng2-activiti-processlist \ ng2-activiti-tasklist \ @@ -11,11 +12,10 @@ for PACKAGE in \ ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ + ng2-alfresco-tag \ ng2-alfresco-upload \ ng2-alfresco-viewer \ - ng2-alfresco-webscript \ - ng2-alfresco-tag \ - ng2-activiti-analytics + ng2-alfresco-webscript do echo "====== clean component: ${PACKAGE} =====" cd "$DIR/../ng2-components/${PACKAGE}" diff --git a/scripts/npm-link-demo-shell.sh b/scripts/npm-link-demo-shell.sh index ef1584c902..3712f17a71 100755 --- a/scripts/npm-link-demo-shell.sh +++ b/scripts/npm-link-demo-shell.sh @@ -89,6 +89,7 @@ done #LINK ALL THE COMPONENTS INSIDE THE DEMOSHELL cd "$DIR/../demo-shell-ng2" for PACKAGE in \ + ng2-activiti-analytics \ ng2-activiti-form \ ng2-activiti-processlist \ ng2-activiti-tasklist \ @@ -97,11 +98,10 @@ for PACKAGE in \ ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ + ng2-alfresco-tag \ ng2-alfresco-upload \ ng2-alfresco-viewer \ ng2-alfresco-webscript \ - ng2-alfresco-tag \ - ng2-activiti-analytics do DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== demo shell linking: ${PACKAGE} =====" diff --git a/scripts/npm-publish.sh b/scripts/npm-publish.sh index 57bba15d31..8f06c4d942 100755 --- a/scripts/npm-publish.sh +++ b/scripts/npm-publish.sh @@ -5,6 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" "$DIR/npm-clean.sh" for PACKAGE in \ + ng2-activiti-analytics \ ng2-activiti-form \ ng2-activiti-processlist \ ng2-activiti-tasklist \ @@ -13,11 +14,10 @@ for PACKAGE in \ ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ + ng2-alfresco-tag \ ng2-alfresco-upload \ ng2-alfresco-viewer \ - ng2-alfresco-webscript \ - ng2-alfresco-tag \ - ng2-activiti-analytics + ng2-alfresco-webscript do DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== PUBLISHING: ${DESTDIR} =====" diff --git a/scripts/update-version.sh b/scripts/update-version.sh index cbeb25005a..52faaf612f 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -15,6 +15,7 @@ then fi for PACKAGE in \ + ng2-activiti-analytics \ ng2-activiti-form \ ng2-activiti-processlist \ ng2-activiti-tasklist \ @@ -23,11 +24,10 @@ for PACKAGE in \ ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ + ng2-alfresco-tag \ ng2-alfresco-upload \ ng2-alfresco-viewer \ - ng2-alfresco-webscript \ - ng2-alfresco-tag \ - ng2-activiti-analytics + ng2-alfresco-webscript do DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== UPDATE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======" @@ -35,6 +35,7 @@ do done for PACKAGE in \ + ng2-activiti-analytics \ ng2-activiti-form \ ng2-activiti-processlist \ ng2-activiti-tasklist \ @@ -43,11 +44,10 @@ for PACKAGE in \ ng2-alfresco-documentlist \ ng2-alfresco-login \ ng2-alfresco-search \ + ng2-alfresco-tag \ ng2-alfresco-upload \ ng2-alfresco-viewer \ - ng2-alfresco-webscript \ - ng2-alfresco-tag \ - ng2-activiti-analytics + ng2-alfresco-webscript do DESTDIR="$DIR/../ng2-components/${PACKAGE}" echo "====== UPDATE VERSION OF ${PACKAGE} to ${VERSION} version ======"