Update init.sh scriptHEADmaster

2 files changed, 24 insertions, 24 deletions

diff --git a/init.sh b/init.sh
index 7bb1551..d9b8f11 100755
--- a/init.sh
+++ b/init.sh
@@ -1,63 +1,63 @@
 #!/usr/bin/env bash
 
 export LANG=C
-export GROUP=evol
-export NAMESPACE=themanaworld
+export GROUP=revolt
 
 CMD="$1"
-PROTO="git@gitlab.com:"
+#PROTO="git@gitlab.com:"
 if [[ -z "${CMD}" ]]; then
     export CMD="default"
 fi
 
-STR=$(git remote -v|grep "https://")
-if [[ -n "${STR}" ]]; then
-    export PROTO="https://gitlab.com/"
-fi
+#STR=$(git remote -v|grep "https://")
+#if [[ -n "${STR}" ]]; then
+#    export PROTO="https://gitlab.com/"
+#fi
+PROTO="https://git.themanaworld.org/"
 
 CLONECMD="git clone --origin upstream"
 CLONE1="${CLONECMD} ${PROTO}${GROUP}"
-CLONE2="${CLONECMD} ${PROTO}${NAMESPACE}"
+CLONE2="${CLONECMD} ${PROTO}"
 
 if [[ "${CMD}" == "all" || "${CMD}" == "default" ]]; then
     ${CLONE1}/clientdata.git client-data
     ${CLONE1}/hercules.git server-code
     ${CLONE1}/serverdata.git server-data
-    ${CLONE1}/evol-tools.git tools
+    ${CLONE1}/tools.git tools
     ${CLONE1}/evol-hercules.git server-code/src/evol
-    ${CLONE1}/evol-local.git server-local
-    ${CLONE1}/evol-docs.git docs
+    ${CLONE1}/local.git server-local
+    ${CLONE1}/docs.git docs
     ln -s server-code/src/evol server-plugin
 elif [[ "${CMD}" == "server" ]]; then
     ${CLONE1}/hercules.git server-code
     ${CLONE1}/serverdata.git server-data
     ${CLONE1}/evol-hercules.git server-code/src/evol
-    ${CLONE1}/evol-tools.git tools
+    ${CLONE1}/tools.git tools
     ln -s server-code/src/evol server-plugin
 elif [[ "${CMD}" == "client" ]]; then
     ${CLONE1}/clientdata.git client-data
-    ${CLONE1}/evol-tools.git tools
+    ${CLONE1}/tools.git tools
 elif [[ "${CMD}" == "music" ]]; then
-    ${CLONE1}/evol-music.git music
+    ${CLONE1}/music.git music
 elif [[ "${CMD}" == "local" ]]; then
-    ${CLONE1}/evol-local.git server-local
+    ${CLONE1}/local.git server-local
     ${CLONE1}/hercules.git server-code
     ${CLONE1}/serverdata.git server-data
     ${CLONE1}/evol-hercules.git server-code/src/evol
-    ${CLONE1}/evol-tools.git tools
+    ${CLONE1}/tools.git tools
     ln -s server-code/src/evol server-plugin
 elif [[ "${CMD}" == "tools" ]]; then
-    ${CLONE1}/evol-tools.git tools
+    ${CLONE1}/tools.git tools
 elif [[ "${CMD}" == "docs" ]]; then
-    ${CLONE1}/evol-docs.git docs
+    ${CLONE1}/docs.git docs
 elif [[ "${CMD}" == "manaplus" ]]; then
-    ${CLONE2}/manaplus/manaplus.git manaplus
+    ${CLONE2}/mana/plus.git manaplus
 elif [[ "${CMD}" == "media" ]]; then
-    ${CLONE1}/evol-media.git media
+    ${CLONE1}/media.git media
 fi
 
 if [[ "${CMD}" == "all" ]]; then
-    ${CLONE1}/evol-music.git music
-    ${CLONE2}/manaplus/manaplus.git manaplus
-    ${CLONE1}/evol-media.git media
+    ${CLONE1}/music.git music
+    ${CLONE2}/mana/plus.git manaplus
+    ${CLONE1}/media.git media
 fi
diff --git a/upgrade.sh b/upgrade.sh
index 825c3b5..a7d88a0 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -9,7 +9,7 @@ function status {
     DIR=$(pwd)
     cd "$1"
     echo "$2:"
-    URL=$(git config remote.origin.url|sed "s/gitorious.org/gitlab.com/")
+    URL=$(git config remote.origin.url|sed "s/gitlab.com/git.themanaworld.org/")
     git config remote.origin.url ${URL}
     echo "set origin to ${URL}"
     cd "$DIR"