(#101) Fix some scripts missing __apps.sh sourcing

ChainMovers · Oct 13, 2024 · ad11d88 · ad11d88
1 parent 9eb993d
commit ad11d88
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 8 deletions.
diff --git a/repair b/repair
@@ -185,6 +185,9 @@ suibase_repair() {
     trap cleanup EXIT
   fi
 
+  # shellcheck source=SCRIPTDIR/scripts/common/__apps.sh
+  source "$REPAIR_SB_DIR/scripts/common/__apps.sh"
+
   if [ -z "$SUIBASE_DAEMON_VERSION_FILE" ]; then
     # shellcheck source=SCRIPTDIR/scripts/common/__suibase-daemon.sh
     source "$REPAIR_SB_DIR/scripts/common/__suibase-daemon.sh"

diff --git a/restart b/restart
@@ -20,6 +20,9 @@ main() {
   source "$SUIBASE_DIR/scripts/common/__globals.sh" "$SCRIPT_COMMON_CALLER" "$WORKDIR"
   trap cleanup EXIT
 
+  # shellcheck source=SCRIPTDIR/scripts/common/__apps.sh
+  source "$SUIBASE_DIR/scripts/common/__apps.sh"
+
   # shellcheck source=SCRIPTDIR/scripts/common/__suibase-daemon.sh
   source "$SUIBASE_DIR/scripts/common/__suibase-daemon.sh"
 

diff --git a/scripts/common/__apps.sh b/scripts/common/__apps.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # shellcheck shell=bash
 
 # You must source __globals.sh before __apps.sh

diff --git a/scripts/common/run-daemon.sh b/scripts/common/run-daemon.sh
@@ -23,6 +23,9 @@ WORKDIR="localnet"
 source "$SUIBASE_DIR/scripts/common/__globals.sh" "$SCRIPT_COMMON_CALLER" "$WORKDIR"
 trap cleanup EXIT
 
+# shellcheck source=SCRIPTDIR/__apps.sh
+source "$SUIBASE_DIR/scripts/common/__apps.sh"
+
 # Switch case on $1 being "suibase" or "dtp".
 case "$PARAM_NAME" in
 "suibase")

diff --git a/scripts/common/show-fds.sh b/scripts/common/show-fds.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 for dir in /proc/*/fd;
 do
     echo -n "$dir "; #need a space to get real columns for the sort

diff --git a/scripts/common/verify-suibase-daemon-lock.sh b/scripts/common/verify-suibase-daemon-lock.sh
@@ -20,6 +20,9 @@ fi
 source "$SUIBASE_DIR/scripts/common/__globals.sh" "$SCRIPT_COMMON_CALLER" "$WORKDIR"
 trap cleanup EXIT
 
+# shellcheck source=SCRIPTDIR/__apps.sh
+source "$SUIBASE_DIR/scripts/common/__apps.sh"
+
 # shellcheck source=SCRIPTDIR/__suibase-daemon.sh
 source "$SUIBASE_DIR/scripts/common/__suibase-daemon.sh"
 

diff --git a/scripts/dev/start-daemon b/scripts/dev/start-daemon
@@ -3,11 +3,14 @@
 SUIBASE_DIR="$HOME/suibase"
 WORKDIR="none"
 
-# shellcheck source=SCRIPTDIR/../common/__suibase-daemon.sh
+# shellcheck source=SCRIPTDIR/../common/__globals.sh
 source "$SUIBASE_DIR/scripts/common/__globals.sh" "$SCRIPT_COMMON_CALLER" "$WORKDIR"
 trap cleanup EXIT
 
-# shellcheck source=SCRIPTDIR/../common/__globals.sh
+# shellcheck source=SCRIPTDIR/../common/__apps.sh
+source "$SUIBASE_DIR/scripts/common/__apps.sh"
+
+# shellcheck source=SCRIPTDIR/../common/__suibase-daemon.sh
 source "$SUIBASE_DIR/scripts/common/__suibase-daemon.sh"
 
 cli_mutex_lock "suibase_daemon"

diff --git a/scripts/dev/stop-daemon b/scripts/dev/stop-daemon
@@ -3,11 +3,15 @@
 SUIBASE_DIR="$HOME/suibase"
 WORKDIR="none"
 
-# shellcheck source=SCRIPTDIR/../common/__suibase-daemon.sh
+
+# shellcheck source=SCRIPTDIR/../common/__globals.sh
 source "$SUIBASE_DIR/scripts/common/__globals.sh" "$SCRIPT_COMMON_CALLER" "$WORKDIR"
 trap cleanup EXIT
 
-# shellcheck source=SCRIPTDIR/../common/__globals.sh
+# shellcheck source=SCRIPTDIR/../common/__apps.sh
+source "$SUIBASE_DIR/scripts/common/__apps.sh"
+
+# shellcheck source=SCRIPTDIR/../common/__suibase-daemon.sh
 source "$SUIBASE_DIR/scripts/common/__suibase-daemon.sh"
 
 cli_mutex_lock "suibase_daemon"

diff --git a/scripts/dev/update-daemon b/scripts/dev/update-daemon
@@ -3,11 +3,14 @@
 SUIBASE_DIR="$HOME/suibase"
 WORKDIR="none"
 
-# shellcheck source=SCRIPTDIR/../common/__suibase-daemon.sh
+# shellcheck source=SCRIPTDIR/../common/__globals.sh
 source "$SUIBASE_DIR/scripts/common/__globals.sh" "$SCRIPT_COMMON_CALLER" "$WORKDIR"
 trap cleanup EXIT
 
-# shellcheck source=SCRIPTDIR/../common/__globals.sh
+# shellcheck source=SCRIPTDIR/../common/__apps.sh
+source "$SUIBASE_DIR/scripts/common/__apps.sh"
+
+# shellcheck source=SCRIPTDIR/../common/__suibase-daemon.sh
 source "$SUIBASE_DIR/scripts/common/__suibase-daemon.sh"
 
 cli_mutex_lock "suibase_daemon"