From 6cb05c1fdfdf4cf099857aacf73b0b410b3f2927 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 19 Feb 2022 14:25:28 +0100 Subject: [PATCH] fix name --- Helper/testreport.sh | 2 +- Hooks/default.sh | 2 +- Inspection/Logic/module_json.sh | 54 ++++++++++++++++----------------- buildProject.php | 2 +- config.sh | 6 ++-- minimumSetup.php | 2 +- setup.sh | 4 +-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Helper/testreport.sh b/Helper/testreport.sh index 678d22e..7bd2063 100755 --- a/Helper/testreport.sh +++ b/Helper/testreport.sh @@ -12,4 +12,4 @@ mkdir -p Build/test sed -i '/^$/d' Build/test/phpstan.json sed -i '/^Warning: /d' Build/test/phpstan.json -#php ../TestReportGenerator/src/index.php -b /home/spl1nes/Orange-Management -l /home/spl1nes/Orange-Management/Build/Config/reportLang.php -c /home/spl1nes/Orange-Management/tests/coverage.xml -s /home/spl1nes/Orange-Management/Build/test/junit_phpcs.xml -a /home/spl1nes/Orange-Management/Build/test/phpstan.json -u /home/spl1nes/Orange-Management/Build/test/junit_php.xml -d /home/spl1nes/Orange-Management/Build/test/ReportExternal --version 1.0.0 \ No newline at end of file +#php ../TestReportGenerator/src/index.php -b /home/spl1nes/Karaka -l /home/spl1nes/Karaka/Build/Config/reportLang.php -c /home/spl1nes/Karaka/tests/coverage.xml -s /home/spl1nes/Karaka/Build/test/junit_phpcs.xml -a /home/spl1nes/Karaka/Build/test/phpstan.json -u /home/spl1nes/Karaka/Build/test/junit_php.xml -d /home/spl1nes/Karaka/Build/test/ReportExternal --version 1.0.0 \ No newline at end of file diff --git a/Hooks/default.sh b/Hooks/default.sh index e9fea1b..07f9781 100755 --- a/Hooks/default.sh +++ b/Hooks/default.sh @@ -6,7 +6,7 @@ strindex() { } orgpath="$(pwd)" -repository="Orange-Management" +repository="Karaka" pos=$(strindex "$orgpath" "$repository") length=$pos+${#repository} rootpath=${orgpath:0:length} diff --git a/Inspection/Logic/module_json.sh b/Inspection/Logic/module_json.sh index ece561c..9203d2f 100755 --- a/Inspection/Logic/module_json.sh +++ b/Inspection/Logic/module_json.sh @@ -1,27 +1,27 @@ -git submodule add https://github.comkaraka-management/oms-Tools.git Modules/Tools -git submodule add https://github.comkaraka-management/oms-Tag.git Modules/Tag -git submodule add https://github.comkaraka-management/oms-Organization.git Modules/Organization -git submodule add https://github.comkaraka-management/oms-Editor.git Modules/Editor -git submodule add https://github.comkaraka-management/oms-Navigation.git Modules/Navigation -git submodule add https://github.comkaraka-management/oms-Auditor.git Modules/Auditor -git submodule add https://github.comkaraka-management/oms-News.git Modules/News -git submodule add https://github.comkaraka-management/oms-Knowledgebase.git Modules/Knowledgebase -git submodule add https://github.comkaraka-management/oms-Help.git Modules/Help -git submodule add https://github.comkaraka-management/oms-Helper.git Modules/Helper -git submodule add https://github.comkaraka-management/oms-Monitoring.git Modules/Monitoring -git submodule add https://github.comkaraka-management/oms-Tasks.git Modules/Tasks -git submodule add https://github.comkaraka-management/oms-Dashboard.git Modules/Dashboard -git submodule add https://github.comkaraka-management/oms-Profile.git Modules/Profile -git submodule add https://github.comkaraka-management/oms-Search.git Modules/Search -git submodule add https://github.comkaraka-management/oms-Calendar.git Modules/Calendar -git submodule add https://github.comkaraka-management/oms-Checklist.git Modules/Checklist -git submodule add https://github.comkaraka-management/oms-Kanban.git Modules/Kanban -git submodule add https://github.comkaraka-management/oms-MyPrivate.git Modules/MyPrivate -git submodule add https://github.comkaraka-management/oms-Marketing.git Modules/Marketing -git submodule add https://github.comkaraka-management/oms-EventManagement.git Modules/EventManagement -git submodule add https://github.comkaraka-management/oms-ProjectManagement.git Modules/ProjectManagement -git submodule add https://github.comkaraka-management/oms-RiskManagement.git Modules/RiskManagement -git submodule add https://github.comkaraka-management/oms-HumanResourceTimeRecording.git Modules/HumanResourceTimeRecording -git submodule add https://github.comkaraka-management/oms-HumanResourceManagement.git Modules/HumanResourceManagement -git submodule add https://github.comkaraka-management/oms-Workflow.git Modules/Workflow -git submodule add https://github.comkaraka-management/oms-Job.git Modules/Job \ No newline at end of file +git submodule add https://github.com/karaka-management/oms-Tools.git Modules/Tools +git submodule add https://github.com/karaka-management/oms-Tag.git Modules/Tag +git submodule add https://github.com/karaka-management/oms-Organization.git Modules/Organization +git submodule add https://github.com/karaka-management/oms-Editor.git Modules/Editor +git submodule add https://github.com/karaka-management/oms-Navigation.git Modules/Navigation +git submodule add https://github.com/karaka-management/oms-Auditor.git Modules/Auditor +git submodule add https://github.com/karaka-management/oms-News.git Modules/News +git submodule add https://github.com/karaka-management/oms-Knowledgebase.git Modules/Knowledgebase +git submodule add https://github.com/karaka-management/oms-Help.git Modules/Help +git submodule add https://github.com/karaka-management/oms-Helper.git Modules/Helper +git submodule add https://github.com/karaka-management/oms-Monitoring.git Modules/Monitoring +git submodule add https://github.com/karaka-management/oms-Tasks.git Modules/Tasks +git submodule add https://github.com/karaka-management/oms-Dashboard.git Modules/Dashboard +git submodule add https://github.com/karaka-management/oms-Profile.git Modules/Profile +git submodule add https://github.com/karaka-management/oms-Search.git Modules/Search +git submodule add https://github.com/karaka-management/oms-Calendar.git Modules/Calendar +git submodule add https://github.com/karaka-management/oms-Checklist.git Modules/Checklist +git submodule add https://github.com/karaka-management/oms-Kanban.git Modules/Kanban +git submodule add https://github.com/karaka-management/oms-MyPrivate.git Modules/MyPrivate +git submodule add https://github.com/karaka-management/oms-Marketing.git Modules/Marketing +git submodule add https://github.com/karaka-management/oms-EventManagement.git Modules/EventManagement +git submodule add https://github.com/karaka-management/oms-ProjectManagement.git Modules/ProjectManagement +git submodule add https://github.com/karaka-management/oms-RiskManagement.git Modules/RiskManagement +git submodule add https://github.com/karaka-management/oms-HumanResourceTimeRecording.git Modules/HumanResourceTimeRecording +git submodule add https://github.com/karaka-management/oms-HumanResourceManagement.git Modules/HumanResourceManagement +git submodule add https://github.com/karaka-management/oms-Workflow.git Modules/Workflow +git submodule add https://github.com/karaka-management/oms-Job.git Modules/Job \ No newline at end of file diff --git a/buildProject.php b/buildProject.php index c145649..15f7e58 100755 --- a/buildProject.php +++ b/buildProject.php @@ -3,7 +3,7 @@ $postBody = $_POST['payload'] ?? ''; $payload = \json_decode($postBody, true); -if (isset($payload['organization'], $payload['organization']['login']) && $payload['organization']['login'] === 'Orange-Management') { +if (isset($payload['organization'], $payload['organization']['login']) && $payload['organization']['login'] === 'Karaka') { \shell_exec('./buildProject.sh > /dev/null 2>/dev/null &'); echo 'Installing'; diff --git a/config.sh b/config.sh index 263126f..6ebe2bb 100755 --- a/config.sh +++ b/config.sh @@ -2,7 +2,7 @@ # Paths BASE_PATH="/var/www/html" -ROOT_PATH="/var/www/html/Orange-Management" +ROOT_PATH="/var/www/html/Karaka" BUILD_PATH="/var/www/html/Build" TOOLS_PATH="/var/www/html/Tools" @@ -18,8 +18,8 @@ DB_USER="root" DB_PASSWORD="root" # Git variables -GITHUB_URL[0]="https://github.comkaraka-management/Orange-Management.git" -GITHUB_URL[1]="https://github.comkaraka-management/Website.git" +GITHUB_URL[0]="https://github.com/karaka-management/Karaka.git" +GITHUB_URL[1]="https://github.com/karaka-management/Website.git" GIT_BRANCH="develop" diff --git a/minimumSetup.php b/minimumSetup.php index efb1996..ec13b1f 100755 --- a/minimumSetup.php +++ b/minimumSetup.php @@ -144,7 +144,7 @@ $request->setData('updatepassword', $config['db']['core']['masters']['admin']['p $request->setData('deleteuser', $config['db']['core']['masters']['admin']['login']); $request->setData('deletepassword', $config['db']['core']['masters']['admin']['password']); -$request->setData('orgname', 'Orange-Management'); +$request->setData('orgname', 'Karaka'); $request->setData('adminname', 'admin'); $request->setData('adminpassword', 'orange'); $request->setData('adminemail', 'admin@oms.com'); diff --git a/setup.sh b/setup.sh index 8882691..469d90a 100755 --- a/setup.sh +++ b/setup.sh @@ -115,8 +115,8 @@ wget -q --tries=2 -nc http://dl.google.com/closure-compiler/compiler-latest.tar. wget -q --tries=2 -nc https://github.com/phan/phan/releases/download/0.12.5/phan.phar wget -q --tries=2 -nc https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.1/php-cs-fixer.phar wget -q --tries=2 -nc https://github.com/jasmine/jasmine/releases/download/v3.1.0/jasmine-standalone-3.1.0.zip -#wget -q --tries=2 -nc https://github.comkaraka-management/Documentor/releases/download/v1.1.1/documentor.phar -wget -q --tries=2 -nc https://github.comkaraka-management/TestReportGenerator/releases/download/1.1.0-rc3/testreportgenerator.phar +#wget -q --tries=2 -nc https://github.com/karaka-management/Documentor/releases/download/v1.1.1/documentor.phar +wget -q --tries=2 -nc https://github.com/karaka-management/TestReportGenerator/releases/download/1.1.0-rc3/testreportgenerator.phar unzip -n -j jasmine-standalone-3.1.0.zip -d ${ROOT_PATH}/jsOMS/tests >/dev/null tar -zxvf compiler-latest.tar.gz >/dev/null