From 541ba8fce5ed569984959f1b2bc8a00e8bccdb09 Mon Sep 17 00:00:00 2001 From: Stylix58 Date: Sat, 1 May 2021 16:10:57 +0200 Subject: [PATCH] Improve the setup and update scripts --- scripts/setup/setup.bat | 30 +++------------------ scripts/setup/setup.sh | 13 +++------ scripts/update/update-git.bat | 3 +++ scripts/update/{update.sh => update-git.sh} | 3 +-- scripts/update/update-pnpm.bat | 3 +++ scripts/update/update-pnpm.sh | 10 +++++++ scripts/update/update.bat | 5 ---- 7 files changed, 25 insertions(+), 42 deletions(-) create mode 100644 scripts/update/update-git.bat rename scripts/update/{update.sh => update-git.sh} (65%) mode change 100755 => 100644 create mode 100644 scripts/update/update-pnpm.bat create mode 100644 scripts/update/update-pnpm.sh delete mode 100644 scripts/update/update.bat diff --git a/scripts/setup/setup.bat b/scripts/setup/setup.bat index 0426bd7..b358ed1 100755 --- a/scripts/setup/setup.bat +++ b/scripts/setup/setup.bat @@ -32,14 +32,14 @@ IF ERRORLEVEL 1 ( GOTO :end ) -where /q npm +where /q pnpm IF ERRORLEVEL 1 ( - ECHO 'Error: npm is not installed.' >&2 - ECHO Please install npm from: https://nodejs.org/en/download/ + ECHO 'Error: pnpm is not installed.' >&2 + ECHO Please install npm from: https://pnpm.io ECHO And make sure its in the path GOTO :end ) -echo Dependencies are already Installed +echo Dependencies are already installed ECHO. echo Creating organization directory ECHO. @@ -66,28 +66,6 @@ git clone https://github.com/fosscord/react-native-withcss react-native-withcss echo {"folders":[{"path":"overview"},{"path":"cdn"},{"path":"api"},{"path":"gateway"},{"path":"media"},{"path":"server-util"},{"path":"ui"},{"path":"client"},{"path":"plugins"},{"path":"themes"},{"path":"landingpage"},{"path":"dashboard"},{"path":"support"},{"path":"css-mediaquery"},{"path":"react-native-withcss"}]}> fosscord.code-workspace -where /q code -IF ERRORLEVEL 0 ( - - ECHO Opening VSCode Workspace - code fosscord.code-workspace -) - - -CHOICE /c yn /m "Do you want to install the Discord Rich Presence?" -IF %ERRORLEVEL% == 2 GOTO :end -cd .. -cd rpc - - -npm install - -npm i pm2 -g -pm2 start --name rpc index.js -pm2 save -pm2-startup install :end -ECHO finished installation @ECHO on -PAUSE diff --git a/scripts/setup/setup.sh b/scripts/setup/setup.sh index d314a44..673a0b2 100755 --- a/scripts/setup/setup.sh +++ b/scripts/setup/setup.sh @@ -1,7 +1,7 @@ #!/bin/sh cat << EOF -------------------------------------- -Discord Open Source Contribution Setup +Fosscord Open Source Contribution Setup strg+c/strg+d to exit ------------------------------------------- This will clone and setup all repositories, @@ -29,13 +29,13 @@ if ! [ -x "$(command -v node)" ]; then echo And make sure its in the path exit 1 fi -if ! [ -x "$(command -v npm)" ]; then +if ! [ -x "$(command -v pnpm)" ]; then echo 'Error: npm is not installed.' >&2 - echo Please install npm from: https://nodejs.org/en/download/ + echo Please install npm from: https://pnpm.io echo And make sure its in the path exit 1 fi -echo ✓ Dependencies are already Installed +echo ✓ Dependencies are already installed echo ------------------------------- echo Creating organization directory mkdir fosscord @@ -60,8 +60,3 @@ git clone https://github.com/fosscord/css-mediaquery css-mediaquery git clone https://github.com/fosscord/react-native-withcss react-native-withcss echo '{"folders":[{"path":"overview"},{"path":"cdn"},{"path":"api"},{"path":"gateway"},{"path":"media"},{"path":"server-util"},{"path":"ui"},{"path":"client"},{"path":"plugins"},{"path":"themes"},{"path":"landingpage"},{"path":"dashboard"},{"path":"support"},{"path":"css-mediaquery"},{"path":"react-native-withcss"}]}' >> fosscord.code-workspace - -if [ -x "$(command -v code)" ]; then - echo Open VSCode Workspace - code fosscord.code-workspace -fi diff --git a/scripts/update/update-git.bat b/scripts/update/update-git.bat new file mode 100644 index 0000000..b917471 --- /dev/null +++ b/scripts/update/update-git.bat @@ -0,0 +1,3 @@ +@ECHO off +ECHO Update for Git... +FOR /D %%a IN (%CD%\fosscord\*) do echo -------------- && echo %%~fa && git -C %%~fa pull \ No newline at end of file diff --git a/scripts/update/update.sh b/scripts/update/update-git.sh old mode 100755 new mode 100644 similarity index 65% rename from scripts/update/update.sh rename to scripts/update/update-git.sh index 9f2f770..99a6f46 --- a/scripts/update/update.sh +++ b/scripts/update/update-git.sh @@ -1,11 +1,10 @@ -echo Update all repositories ... +echo Update for Git... cd ../../../ for D in */; do echo -------------- echo "$D"; cd $D git pull - npm i cd .. done echo Done \ No newline at end of file diff --git a/scripts/update/update-pnpm.bat b/scripts/update/update-pnpm.bat new file mode 100644 index 0000000..d6b7899 --- /dev/null +++ b/scripts/update/update-pnpm.bat @@ -0,0 +1,3 @@ +@ECHO off +ECHO Update for PNPM... +FOR /D %%a IN (%CD%\fosscord\*) do echo -------------- && echo %%~fa && cd %%~fa && pnpm i \ No newline at end of file diff --git a/scripts/update/update-pnpm.sh b/scripts/update/update-pnpm.sh new file mode 100644 index 0000000..25dac15 --- /dev/null +++ b/scripts/update/update-pnpm.sh @@ -0,0 +1,10 @@ +echo Update for Git... +cd ../../../ +for D in */; do + echo -------------- + echo "$D"; + cd $D + pnpm i + cd .. +done +echo Done \ No newline at end of file diff --git a/scripts/update/update.bat b/scripts/update/update.bat deleted file mode 100644 index 2e1a2c0..0000000 --- a/scripts/update/update.bat +++ /dev/null @@ -1,5 +0,0 @@ -@ECHO off -ECHO Update... -cd ..\..\..\ -FOR /D %%a IN (%CD%\fosscord-workspace\*) do git -C %%~fa pull && npm i -PAUSE \ No newline at end of file