Script cleanup

Author: coincashew

deploy-nimbus-nethermind.py

@@ -105,7 +105,7 @@
 parser.add_argument("--el_p2p_port", type=int, help="Sets the Execution Client's P2P Port", default=EL_P2P_PORT)
 parser.add_argument("--el_rpc_port", type=int, help="Sets the Execution Client's RPC Port", default=EL_RPC_PORT)
 parser.add_argument("--el_max_peers", type=int, help="Sets the Execution Client's max peer count", default=EL_MAX_PEER_COUNT)
-parser.add_argument("--cl_p2p_port",  type=int, help="Sets the Consensus Client's P2P Port", default=CL_P2P_PORT)
+parser.add_argument("--cl_p2p_port", type=int, help="Sets the Consensus Client's P2P Port", default=CL_P2P_PORT)
 parser.add_argument("--cl_rest_port", type=int, help="Sets the Consensus Client's REST Port", default=CL_REST_PORT)
 parser.add_argument("--cl_max_peers", type=int, help="Sets the Consensus Client's max peer count", default=CL_MAX_PEER_COUNT)
 parser.add_argument("-v", "--version", action="version", version="%(prog)s 1.0.0")
@@ -174,7 +174,7 @@ def is_valid_eth_address(address):
     answer=PromptUtils(Screen()).prompt_for_yes_or_no(f"Confirmation: Verify your settings\n\nNetwork: {eth_network.upper()}\nInstall Node Only (Not a validator): {NODE_ONLY}\n\nIs this correct?")    
 
 if not answer:
-    file_name =  os.path.basename(sys.argv[0])
+    file_name = os.path.basename(sys.argv[0])
     print(f'\nInstall cancelled by user. \n\nWhen ready, re-run install command:\npython3 {file_name}')
     exit(0)
 

ethpillar.sh

@@ -556,7 +556,7 @@ while true; do
 \nWith the default install, basic alerts for CPU/DISK/RAM are configured.
 \nTo receive these alerts:
 \n- Navigate to Grafana in your web browser
-\n- Click "Alerting" (the alert bell icon) on the left-hand side menu
+\n- Click Alerting (the alert bell icon) on the left-hand side menu
 \n- Create contact points and notification policies" 20 78
         ;;
       10)

functions.sh

@@ -30,7 +30,7 @@ getNetworkConfig() {
 
 exit_on_error() {
     exit_code=$1
-    last_command=${@:2}
+    last_command="${@:2}"
     if [ $exit_code -ne 0 ]; then
         >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}."
         exit $exit_code
@@ -209,7 +209,7 @@ getPubKeys(){
             _teku+=(0x$(sudo -u validator bash -c "cat $json | jq -r '.pubkey'"))
          done
          # Convert to string
-         TEMP=${_teku[@]}
+         TEMP="${_teku[@]}"
          convertLIST
       ;;
       Nimbus)
@@ -479,7 +479,7 @@ generateVoluntaryExitMessage(){
         # Prompt user for path to keystores
         read -r -p "Enter path to your keystore-m_##.json file(s): " KEYSTORE_PATH
         # Check number of keystores
-        local COUNT=$(ls ${KEYSTORE_PATH}/keystore*.json | wc -l)
+        local COUNT=$(ls "${KEYSTORE_PATH}"/keystore*.json | wc -l)
         if [[ $COUNT -gt 0 ]]; then
             echo "INFO: Found $COUNT keystore files"
             echo "INFO: Using keystore path: $KEYSTORE_PATH"
@@ -495,7 +495,7 @@ generateVoluntaryExitMessage(){
         echo "INFO: Using keystore passphrase: $KEYSTORE_PASSPHRASE"
 
         # Iterate through each file and create the VEM
-        for KEYSTORE in $(ls ${KEYSTORE_PATH}/keystore*.json);
+        for KEYSTORE in "${KEYSTORE_PATH}"/keystore*.json;
         do
            ethdo validator exit --validator=${KEYSTORE} "--passphrase=${KEYSTORE_PASSPHRASE}" --json > $VEM_PATH/exit_tmp.json
            INDEX=$(cat $VEM_PATH/exit_tmp.json | jq -r .message.validator_index)
@@ -539,7 +539,7 @@ broadcastVoluntaryExitMessageLocally(){
         read -r -p "Enter path to your VEM file(s) (Press enter to use default: $VEM_PATH_DEFAULT):" VEM_PATH
         VEM_PATH=${VEM_PATH:-$VEM_PATH_DEFAULT}
         # Check number of keystores
-        local COUNT=$(ls ${VEM_PATH}/exit*.json | wc -l)
+        local COUNT=$(ls "${VEM_PATH}"/exit*.json | wc -l)
         if [[ $COUNT -gt 0 ]]; then
             echo "INFO: Found $COUNT VEM files"
             echo "INFO: Using VEM path: $VEM_PATH"
@@ -553,7 +553,7 @@ broadcastVoluntaryExitMessageLocally(){
         # Final confirmation
         if whiptail --title "Broadcast Voluntary Exit Messages" --defaultno --yesno "This will voluntary exit ${COUNT} validator(s).\nAre you sure you want to continue?" 9 78; then
             # Iterate through each file and broadcast the VEM
-            for VEM in $(ls ${VEM_PATH}/exit*.json);
+            for VEM in "${VEM_PATH}"/exit*.json;
             do
                ethdo --connection ${API_BN_ENDPOINT} validator exit --signed-operations ${VEM}
                INDEX=$(cat $VEM | jq -r .message.validator_index)

install-nimbus-nethermind.sh

@@ -34,7 +34,7 @@ getc() {
 
 exit_on_error() {
     exit_code=$1
-    last_command=${@:2}
+    last_command="${@:2}"
     if [ $exit_code -ne 0 ]; then
         >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}."
         exit $exit_code

install.sh

@@ -31,7 +31,7 @@ getc() {
 
 exit_on_error() {
     exit_code=$1
-    last_command=${@:2}
+    last_command="${@:2}"
     if [ $exit_code -ne 0 ]; then
         >&2 echo "\"${last_command}\" command failed with exit code ${exit_code}."
         exit $exit_code

patches/001-alerts.sh

@@ -40,5 +40,5 @@ whiptail --title "Configure Alerting with Grafana" --msgbox "Grafana enables use
 \nWith the default install, basic alerts for CPU/DISK/RAM are configured.
 \nTo receive these alerts:
 \n- Navigate to Grafana in your web browser
-\n- Click "Alerting" (the alert bell icon) on the left-hand side menu
+\n- Click Alerting (the alert bell icon) on the left-hand side menu
 \n- Create contact points and notification policies" 20 78

update_consensus.sh

@@ -114,7 +114,7 @@ function updateClient(){
 		;;
 	  Nimbus)
 		RELEASE_URL="https://api.github.com/repos/status-im/nimbus-eth2/releases/latest"
-		BINARIES_URL="$(curl -s $RELEASE_URL | jq -r ".assets[] | select(.name) | .browser_download_url" | grep _Linux_amd64.*.tar.gz$)"
+		BINARIES_URL="$(curl -s $RELEASE_URL | jq -r ".assets[] | select(.name) | .browser_download_url" | grep "_Linux_amd64.*.tar.gz$")"
 		echo Downloading URL: $BINARIES_URL
 		cd $HOME
 		wget -O nimbus.tar.gz $BINARIES_URL

view_logs.sh

@@ -15,7 +15,7 @@ fi
 current_user=$(whoami)
 group_members=$(getent group systemd-journal | cut -d: -f2-)
 
-if ! echo "$current_user" | grep -qw "$current_user" <<<"$group_members"; then
+if ! echo "$group_members" | grep -qE -o -- "$current_user"; then
   clear
   # Add the user to the systemd-journal group if they're not already a member
   sudo usermod -aG systemd-journal $current_user