From fea2ad3d7d09b44c3de1dbcdd3f8750aaa6776d5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 18 Apr 2019 10:57:59 +0300 Subject: Test newest markdown. --- rebuild-wekan.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rebuild-wekan.sh') diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 21254918..6739ebd0 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -111,7 +111,7 @@ do "Build Wekan") echo "Building Wekan." wekan_repo_check - rm -rf packages + rm -rf packages/kadira-flow-router packages/meteor-useraccounts-core packages/meteor-accounts-cas packages/wekan-ldap packages/wekan-ldap packages/wekan-scrfollbar packages/meteor-accounts-oidc packages/markdown mkdir packages cd packages git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router @@ -120,6 +120,7 @@ do git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git + git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc rm -rf meteor-accounts-oidc -- cgit v1.2.3-1-g7c22 From 6117097a93bfb11c8bd4c87a23c44a50e22ceb87 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 20 Apr 2019 14:52:37 +0300 Subject: - Upgrade to Node 8.16.0 - Change git repo urls from git:// to https:// Thanks to xet7 ! --- rebuild-wekan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rebuild-wekan.sh') diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 6739ebd0..6e8bc524 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -5,7 +5,7 @@ echo " with 'sudo dpkg-reconfigure locales' , so that MongoDB works correct echo " You can still use any other locale as your main locale." #Below script installs newest node 8.x for Debian/Ubuntu/Mint. -#NODE_VERSION=8.14.1 +#NODE_VERSION=8.16.0 #X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" function pause(){ -- cgit v1.2.3-1-g7c22 From 73e265d8fd050ae3daa67472b4465a5c49d68910 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 20 Apr 2019 15:18:33 +0300 Subject: Include to Wekan packages directory contents, so that meteor command would build all directly. This also simplifies build scripts. Thanks to xet7 ! --- rebuild-wekan.sh | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'rebuild-wekan.sh') diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 6e8bc524..518936b6 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -46,19 +46,20 @@ function npm_call(){ } function wekan_repo_check(){ - git_remotes="$(git remote show 2>/dev/null)" - res="" - for i in $git_remotes; do - res="$(git remote get-url $i | sed 's/.*wekan\/wekan.*/wekan\/wekan/')" - if [[ "$res" == "wekan/wekan" ]]; then - break - fi - done - - if [[ "$res" != "wekan/wekan" ]]; then - echo "$PWD is not a wekan repository" - exit; - fi +## UNCOMMENTING, IT'S NOT REQUIRED THAT /HOME/USERNAME IS /HOME/WEKAN +# git_remotes="$(git remote show 2>/dev/null)" +# res="" +# for i in $git_remotes; do +# res="$(git remote get-url $i | sed 's/.*wekan\/wekan.*/wekan\/wekan/')" +# if [[ "$res" == "wekan/wekan" ]]; then +# break +# fi +# done +# +# if [[ "$res" != "wekan/wekan" ]]; then +# echo "$PWD is not a wekan repository" +# exit; +# fi } echo @@ -111,19 +112,20 @@ do "Build Wekan") echo "Building Wekan." wekan_repo_check - rm -rf packages/kadira-flow-router packages/meteor-useraccounts-core packages/meteor-accounts-cas packages/wekan-ldap packages/wekan-ldap packages/wekan-scrfollbar packages/meteor-accounts-oidc packages/markdown - mkdir packages - cd packages - git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router - git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core - git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git - git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git - git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git - git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git - git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git - mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc - mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc - rm -rf meteor-accounts-oidc + # REPOS BELOW ARE INCLUDED TO WEKAN REPO + #rm -rf packages/kadira-flow-router packages/meteor-useraccounts-core packages/meteor-accounts-cas packages/wekan-ldap packages/wekan-ldap packages/wekan-scrfollbar packages/meteor-accounts-oidc packages/markdown + #mkdir packages + #cd packages + #git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router + #git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core + #git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git + #git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git + #git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git + #git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git + #git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git + #mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc + #mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc + #rm -rf meteor-accounts-oidc if [[ "$OSTYPE" == "darwin"* ]]; then echo "sed at macOS"; sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js -- cgit v1.2.3-1-g7c22 From f714b59c884ee0d113475195d3eb05121517c8ab Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 20 Apr 2019 16:31:10 +0300 Subject: Uncomment not needed lines. --- rebuild-wekan.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rebuild-wekan.sh') diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 518936b6..adb3fd93 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -45,7 +45,7 @@ function npm_call(){ rm -rf $TMPDIR } -function wekan_repo_check(){ +#function wekan_repo_check(){ ## UNCOMMENTING, IT'S NOT REQUIRED THAT /HOME/USERNAME IS /HOME/WEKAN # git_remotes="$(git remote show 2>/dev/null)" # res="" @@ -60,7 +60,7 @@ function wekan_repo_check(){ # echo "$PWD is not a wekan repository" # exit; # fi -} +#} echo PS3='Please enter your choice: ' @@ -111,7 +111,7 @@ do ;; "Build Wekan") echo "Building Wekan." - wekan_repo_check + #wekan_repo_check # REPOS BELOW ARE INCLUDED TO WEKAN REPO #rm -rf packages/kadira-flow-router packages/meteor-useraccounts-core packages/meteor-accounts-cas packages/wekan-ldap packages/wekan-ldap packages/wekan-scrfollbar packages/meteor-accounts-oidc packages/markdown #mkdir packages -- cgit v1.2.3-1-g7c22 From 348b612f981581a6ec4f896e0d5bf9d835e837c3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 20 Apr 2019 16:34:16 +0300 Subject: Fix rebuild script. --- rebuild-wekan.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'rebuild-wekan.sh') diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index adb3fd93..c473f414 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -126,15 +126,14 @@ do #mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc #mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc #rm -rf meteor-accounts-oidc - if [[ "$OSTYPE" == "darwin"* ]]; then - echo "sed at macOS"; - sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js - else - echo "sed at ${OSTYPE}" - sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js - fi - - cd .. + #if [[ "$OSTYPE" == "darwin"* ]]; then + # echo "sed at macOS"; + # sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js + #else + # echo "sed at ${OSTYPE}" + # sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js + #fi + #cd .. rm -rf node_modules meteor npm install rm -rf .build -- cgit v1.2.3-1-g7c22