move scripts

2024-06-12 09:49:58 +02:00 · 2024-06-12 09:49:58 +02:00 · b72baefd53
commit b72baefd53
parent e0bac304cf
12 changed files with 23 additions and 53 deletions
--- a/.forgejo/workflows/build-client.yml
+++ b/.forgejo/workflows/build-client.yml
@ -21,7 +21,7 @@ jobs:
    - name: Checkout
      uses: actions/checkout@v4
    - name: Notify Action Start
-      run: bash webhook.sh "**(Client)** Build Action Started at"
+      run: bash scripts/webhook.sh "**(Client)** Build Action Started at"
    - name: Initialize Gradle
      uses: https://github.com/gradle/actions/setup-gradle@v3
    - name: Build
@ -30,7 +30,7 @@ jobs:
      if: github.ref == 'refs/heads/release'
      run: |
        ./gradlew Client:proguardRelease
-        MOBFARGS=-p bash mobf.sh Client/build/proguard/BaseBand-Broadway.jar
+        MOBFARGS=-p bash scripts/mobf.sh Client/build/proguard/BaseBand-Broadway.jar

    - name: Upload DSM
      continue-on-error: true
@ -53,7 +53,7 @@ jobs:
        BB_HOST: ${{ vars.BB_HOST }}
        BB_PORT: ${{ vars.BB_PORT }}
        BB_PATH: ${{ vars.BB_PATH }}
-      run: bash push_file.sh Client/build/proguard/BaseBand-Broadway.jar 3849
+      run: bash scripts/push_file.sh Client/build/proguard/BaseBand-Broadway.jar 3849
    - name: Notify Action Completion
-      run: bash webhook.sh "**(Client)** Build Action Completed at"
+      run: bash scripts/webhook.sh "**(Client)** Build Action Completed at"

--- a/.forgejo/workflows/build-installer.yml
+++ b/.forgejo/workflows/build-installer.yml
@ -21,13 +21,13 @@ jobs:
    - name: Checkout
      uses: actions/checkout@v4
    - name: Notify Action Start
-      run: bash webhook.sh "**(Installer)** Build Action Started at"
+      run: bash scripts/webhook.sh "**(Installer)** Build Action Started at"
    - name: Initialize Gradle
      uses: https://github.com/gradle/actions/setup-gradle@v3
    - name: Build
      run: | 
        ./gradlew --no-daemon Installer:build
-        bash mobf.sh Installer/build/libs/BaseBand-Installer.jar
+        bash scripts/mobf.sh Installer/build/libs/BaseBand-Installer.jar
    - name: Upload Installer
      continue-on-error: true
      uses: forgejo/upload-artifact@v4
@ -35,4 +35,4 @@ jobs:
        name: BaseBand-Installer.jar
        path: Installer/build/libs/BaseBand-Installer.jar
    - name: Notify Action Completion
-      run: bash webhook.sh "**(Installer)** Build Action Completed at"
+      run: bash scripts/webhook.sh "**(Installer)** Build Action Completed at"
--- a/.forgejo/workflows/build-loader.yml
+++ b/.forgejo/workflows/build-loader.yml
@ -21,13 +21,13 @@ jobs:
    - name: Checkout
      uses: actions/checkout@v4
    - name: Notify Action Start
-      run: bash webhook.sh "**(Loader)** Build Action Started at"
+      run: bash scripts/webhook.sh "**(Loader)** Build Action Started at"
    - name: Initialize Gradle
      uses: https://github.com/gradle/actions/setup-gradle@v3
    - name: Build
      run: |
        ./gradlew --no-daemon Loader:build Loader:proguard
-        bash mobf.sh Loader/build/proguard/BaseBand-Loader.jar
+        bash scripts/mobf.sh Loader/build/proguard/BaseBand-Loader.jar
    - name: Upload Loader
      continue-on-error: true
      uses: forgejo/upload-artifact@v4
@ -42,6 +42,6 @@ jobs:
        BB_HOST: ${{ vars.BB_HOST }}
        BB_PORT: ${{ vars.BB_PORT }}
        BB_PATH: ${{ vars.BB_PATH }}
-      run: bash push_file.sh Loader/build/proguard/BaseBand-Loader.jar 3848
+      run: bash scripts/push_file.sh Loader/build/proguard/BaseBand-Loader.jar 3848
    - name: Notify Action Completion
-      run: bash webhook.sh "**(Loader)** Build Action Completed at"
+      run: bash scripts/webhook.sh "**(Loader)** Build Action Completed at"
--- a/.forgejo/workflows/build-server.yml
+++ b/.forgejo/workflows/build-server.yml
@ -22,7 +22,7 @@ jobs:
    - name: Checkout
      uses: actions/checkout@v4
    - name: Notify Action Start
-      run: bash webhook.sh "**(Server)** Build Action Started at"
+      run: bash scripts/webhook.sh "**(Server)** Build Action Started at"
    - name: Initialize Gradle
      uses: https://github.com/gradle/actions/setup-gradle@v3
    - name: Build
@ -48,7 +48,7 @@ jobs:
        BB_PORT: ${{ vars.BB_PORT }}
        BB_PATH: ${{ vars.BB_PATH }}
      run: | 
-        bash push_file.sh Server/build/libs/BaseBand-Server.jar
-        bash push_file.sh Discord/build/libs/BaseBand-Discord.jar
+        bash scripts/push_file.sh Server/build/libs/BaseBand-Server.jar
+        bash scripts/push_file.sh Discord/build/libs/BaseBand-Discord.jar
    - name: Notify Action Completion
-      run: bash webhook.sh "**(Server)** Build Action Completed at"
+      run: bash scripts/webhook.sh "**(Server)** Build Action Completed at"
--- a/.run/mobf.run.xml
+++ b/.run/mobf.run.xml
@ -1,23 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="mobf" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="" />
+    <option name="SCRIPT_TEXT" value="bash scripts/mobf.sh Client/build/proguard/BaseBand-Broadway.jar Loader/build/proguard/BaseBand-Loader.jar" />
    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/mobf.sh" />
-    <option name="SCRIPT_OPTIONS" value="*/build/proguard/BaseBand-*.jar" />
-    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
-    <option name="INTERPRETER_PATH" value="/bin/fish" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
-    <option name="EXECUTE_SCRIPT_FILE" value="true" />
-    <envs />
-    <method v="2" />
-  </configuration>
-  <configuration default="false" name="mobf" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="bash mobf.sh Client/build/proguard/BaseBand-Broadway.jar Loader/build/proguard/BaseBand-Loader.jar" />
-    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/mobf.sh" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/scripts/mobf.sh" />
    <option name="SCRIPT_OPTIONS" value="*/build/proguard/BaseBand-*.jar" />
    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
--- a/.run/push_local.run.xml
+++ b/.run/push_local.run.xml
@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="push_local" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="" />
+    <option name="SCRIPT_TEXT" value="bash scripts/push_local.sh" />
    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/push_local.sh" />
+    <option name="SCRIPT_PATH" value="./scripts/push_local.sh" />
    <option name="SCRIPT_OPTIONS" value="" />
    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@ -10,22 +10,7 @@
    <option name="INTERPRETER_PATH" value="/bin/bash" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="EXECUTE_IN_TERMINAL" value="false" />
-    <option name="EXECUTE_SCRIPT_FILE" value="true" />
-    <envs />
-    <method v="2" />
-  </configuration>
-  <configuration default="false" name="push_local" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="" />
-    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/push_local.sh" />
-    <option name="SCRIPT_OPTIONS" value="" />
-    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
-    <option name="INTERPRETER_PATH" value="/bin/bash" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
-    <option name="EXECUTE_SCRIPT_FILE" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
    <envs />
    <method v="2" />
  </configuration>
--- a/scripts/mobf.sh
+++ b/scripts/mobf.sh
--- a/scripts/push_file.sh
+++ b/scripts/push_file.sh
--- a/scripts/push_file.sh.old
+++ b/scripts/push_file.sh.old
--- a/scripts/push_local.sh
+++ b/scripts/push_local.sh
@ -9,6 +9,6 @@ if [ "$BB_PATH" = '' ] ; then
  export BB_PATH="/root/baseband/rewrite"
 fi

-bash push_file.sh Server/build/libs/BaseBand-Server.jar
-bash push_file.sh Client/build/proguard/BaseBand-Broadway.jar
-bash push_file.sh Loader/build/proguard/BaseBand-Loader.jar
+bash scripts/push_file.sh Server/build/libs/BaseBand-Server.jar
+bash scripts/push_file.sh Client/build/proguard/BaseBand-Broadway.jar
+bash scripts/push_file.sh Loader/build/proguard/BaseBand-Loader.jar
--- a/scripts/trigger-rebuild.sh
+++ b/scripts/trigger-rebuild.sh
--- a/scripts/webhook.sh
+++ b/scripts/webhook.sh