General improvemnents and fixes

Author: jbatonnet

build/1-buildroot/get-final.sh

@@ -18,7 +18,7 @@ export RCLONE_CONFIG_BUILDER_TYPE=sftp
 export RCLONE_CONFIG_BUILDER_HOST=$BUILDER_IP
 export RCLONE_CONFIG_BUILDER_PORT=${BUILDER_PORT:-22}
 export RCLONE_CONFIG_BUILDER_USER=${BUILDER_USER:-"root"}
-export RCLONE_CONFIG_BUILDER_PASS=`rclone obscure "${BUILDER_PASS}"`
+export RCLONE_CONFIG_BUILDER_PASS=$(rclone obscure "${BUILDER_PASS}")
 
 
 rclone -v sync Builder:$BUILDER_PATH/output/final /files/1-buildroot

build/2-external/get-external.sh

@@ -38,14 +38,3 @@ unzip -d moonraker moonraker.zip
 mkdir -p /files/2-external/usr/share/moonraker
 rm -rf /files/2-external/usr/share/moonraker/*
 cp -pr /work/moonraker/*/* /files/2-external/usr/share/moonraker
-
-
-# OctoApp
-# echo "Downloading OctoApp..."
-
-# wget -O octoapp.zip https://github.com/crysxd/OctoApp-Plugin/archive/refs/tags/2.1.6.zip
-# unzip -d octoapp octoapp.zip
-
-# mkdir -p /files/2-external/usr/share/octoapp
-# rm -rf /files/2-external/usr/share/octoapp/*
-# cp -pr /work/octoapp/* /files/2-external/usr/share/octoapp

build/3-python/get-packages.sh

@@ -14,7 +14,7 @@ export RCLONE_CONFIG_KOBRA_TYPE=sftp
 export RCLONE_CONFIG_KOBRA_HOST=$KOBRA_IP
 export RCLONE_CONFIG_KOBRA_PORT=${KOBRA_PORT:-22}
 export RCLONE_CONFIG_KOBRA_USER=root
-export RCLONE_CONFIG_KOBRA_PASS=`rclone obscure "rockchip"`
+export RCLONE_CONFIG_KOBRA_PASS=$(rclone obscure "rockchip")
 
 
 mkdir -p /files/3-python/usr/lib/python3.11/site-packages

build/build-swu.sh

@@ -40,24 +40,24 @@ echo "Optimizing size..."
 
 cd /tmp/update_swu/rinkhals
 
-for FILE in `find -type f -name "*.so*"`; do
-    FILES=`ls -al $FILE*`
-    SIZE=`echo "$FILES" | head -n 1 | awk '{print $5}'`
-    CANONICAL=`echo "$FILES" | awk -v SIZE="$SIZE" '{ if ($5 == SIZE) { print $NF } }' | tail -n 1`
+for FILE in $(find -type f -name "*.so*"); do
+    FILES=$(ls -al $FILE*)
+    SIZE=$(echo "$FILES" | head -n 1 | awk '{print $5}')
+    CANONICAL=$(echo "$FILES" | awk -v SIZE="$SIZE" '{ if ($5 == SIZE) { print $NF } }' | tail -n 1)
 
     if [ "$FILE" != "$CANONICAL" ]; then
-        #RELPATH=`python3 -c "import os.path; print(os.path.relpath('$CANONICAL', '$(dirname $FILE)'))"`
+        #RELPATH=$(python3 -c "import os.path; print(os.path.relpath('$CANONICAL', '$(dirname $FILE)'))")
         #echo "$FILE ($SIZE bytes) > $(basename $CANONICAL)"
 
         rm $FILE
         ln -s $(basename $CANONICAL) $FILE
     fi
 done
 
-BUSYBOX_SIZE=`ls -al ./bin/busybox | awk '{print $5}'`
+BUSYBOX_SIZE=$(ls -al ./bin/busybox | awk '{print $5}')
 
-for FILE in `find ./bin -type f | grep -v busybox`; do
-    SIZE=`ls -al $FILE | awk '{print $5}'`
+for FILE in $(find ./bin -type f | grep -v busybox); do
+    SIZE=$(ls -al $FILE | awk '{print $5}')
 
     if [ "$SIZE" -eq "$BUSYBOX_SIZE" ]; then
         #echo "$FILE ($SIZE bytes) > busybox"
@@ -67,8 +67,8 @@ for FILE in `find ./bin -type f | grep -v busybox`; do
     fi
 done
 
-for FILE in `find ./sbin -type f`; do
-    SIZE=`ls -al $FILE | awk '{print $5}'`
+for FILE in $(find ./sbin -type f); do
+    SIZE=$(ls -al $FILE | awk '{print $5}')
 
     if [ "$SIZE" -eq "$BUSYBOX_SIZE" ]; then
         #echo "$FILE ($SIZE bytes) > busybox"
@@ -78,8 +78,8 @@ for FILE in `find ./sbin -type f`; do
     fi
 done
 
-for FILE in `find ./usr/bin -type f`; do
-    SIZE=`ls -al $FILE | awk '{print $5}'`
+for FILE in $(find ./usr/bin -type f); do
+    SIZE=$(ls -al $FILE | awk '{print $5}')
 
     if [ "$SIZE" -eq "$BUSYBOX_SIZE" ]; then
         #echo "$FILE ($SIZE bytes) > busybox"
@@ -89,8 +89,8 @@ for FILE in `find ./usr/bin -type f`; do
     fi
 done
 
-for FILE in `find ./usr/sbin -type f`; do
-    SIZE=`ls -al $FILE | awk '{print $5}'`
+for FILE in $(find ./usr/sbin -type f); do
+    SIZE=$(ls -al $FILE | awk '{print $5}')
 
     if [ "$SIZE" -eq "$BUSYBOX_SIZE" ]; then
         #echo "$FILE ($SIZE bytes) > busybox"

build/deploy-dev.sh

@@ -14,7 +14,7 @@ export RCLONE_CONFIG_KOBRA_TYPE=sftp
 export RCLONE_CONFIG_KOBRA_HOST=$KOBRA_IP
 export RCLONE_CONFIG_KOBRA_PORT=${KOBRA_PORT:-22}
 export RCLONE_CONFIG_KOBRA_USER=root
-export RCLONE_CONFIG_KOBRA_PASS=`rclone obscure "rockchip"`
+export RCLONE_CONFIG_KOBRA_PASS=$(rclone obscure "rockchip")
 
 # Sync base files
 mkdir -p /tmp/target
@@ -45,28 +45,8 @@ cp -pr /files/4-rinkhals/* /tmp/target
 
 echo "dev" > /tmp/target/.version
 
-
-# TODO: We need to wait for this PR to complete: https://github.com/rclone/rclone/pull/8040
-# # Recreate symbolic links to save space
-# echo "Optimizing size..."
-# cd /tmp/target
-
-# for FILE in `find -type f -name "*.so*"`; do
-#     FILES=`ls -al $FILE*`
-#     SIZE=`echo "$FILES" | head -n 1 | awk '{print $5}'`
-#     CANONICAL=`echo "$FILES" | awk -v SIZE="$SIZE" '{ if ($5 == SIZE) { print $NF } }' | tail -n 1`
-
-#     if [ "$FILE" != "$CANONICAL" ]; then
-#         #echo "$FILE ($SIZE bytes) > $CANONICAL"
-
-#         rm $FILE
-#         ln -s $CANONICAL $FILE
-#     fi
-# done
-
-
 # Push to the Kobra
-rclone -v sync --absolute \
+rclone -v sync --absolute --sftp-disable-hashcheck \
     --filter "- *.log" --filter "- *.pyc" --filter "- __pycache__/**" \
     --filter "+ /*.*" --filter "+ /bin/**" --filter "+ /sbin/**" --filter "+ /usr/**" --filter "+ /etc/**" --filter "+ /home/**" --filter "+ /lib/**" --filter "+ /.version" \
     --filter "- *" \

build/swu-tools/debug-bundle/update.sh

@@ -21,7 +21,7 @@ cp /userdata/app/gk/printer_data/logs/*.log $TMP_PATH/moonraker/ 2> /dev/null
 
 # Collect different Rinkhals versions logs
 cd /useremain/rinkhals
-for VERSION in `ls -1d */`; do
+for VERSION in $(ls -1d */); do
     mkdir -p $TMP_PATH/$VERSION
     cp /useremain/rinkhals/$VERSION*.log $TMP_PATH/$VERSION 2> /dev/null
     cp /useremain/rinkhals/$VERSION/logs/*.log $TMP_PATH/$VERSION 2> /dev/null

build/swu-tools/ssh/update.sh

@@ -23,9 +23,9 @@ chmod +x $TMP_TOOL_PATH/dropbear
 chmod +x $TMP_TOOL_PATH/sftp-server
 
 # Kill anything on port 2222
-INODE=`cat /proc/net/tcp | grep 00000000:08AE | awk '/.*:.*:.*/{print $10;}'`
+INODE=$(cat /proc/net/tcp | grep 00000000:08AE | awk '/.*:.*:.*/{print $10;}')
 if [[ "$INODE" != "" ]]; then
-    PID=`ls -l /proc/*/fd/* 2> /dev/null | grep "socket:\[$INODE\]" | awk -F'/' '{print $3}'`
+    PID=$(ls -l /proc/*/fd/* 2> /dev/null | grep "socket:\[$INODE\]" | awk -F'/' '{print $3}')
     kill -9 $PID
     sleep 1
 fi

files/4-rinkhals/etc/profile.d/rinkhals.sh

@@ -1,6 +1,6 @@
 export HOME=/useremain/home/rinkhals
 export PATH=$PATH:$HOME:$HOME/bin:$HOME/usr/bin:$HOME/sbin:$HOME/usr/sbin
-export LD_LIBRARY_PATH=$HOME/usr/lib:$HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/lib:/usr/lib:$LD_LIBRARY_PATH
 
 export PATH=/usr/libexec/gcc/arm-buildroot-linux-uclibcgnueabihf/11.4.0:$PATH
 export CC=/usr/bin/gcc

files/4-rinkhals/start.sh

@@ -1,55 +1,5 @@
-msleep() {
-    usleep $(($1 * 1000))
-}
-beep() {
-    echo 1 > /sys/class/pwm/pwmchip0/pwm0/enable
-    usleep $((${*}*1000))
-    echo 0 > /sys/class/pwm/pwmchip0/pwm0/enable
-}
-log() {
-    echo "${*}"
-
-    mkdir -p $RINKHALS_ROOT/logs
-    echo "`date`: ${*}" >> $RINKHALS_ROOT/logs/rinkhals.log
-}
-kill_by_name() {
-    PIDS=`ps | grep "$1" | grep -v grep | awk '{print $1}'`
-
-    for PID in `echo "$PIDS"`; do
-        CMDLINE=`cat /proc/$PID/cmdline` 2>/dev/null
-
-        log "Killing $PID ($CMDLINE)"
-        kill -9 $PID
-    done
-}
-assert_by_name() {
-    PIDS=`ps | grep "$1" | grep -v grep | awk '{print $1}'`
-
-    if [ "$PIDS" == "" ]; then
-        log "/!\ ${*} should be running but it's not"
-        quit
-    fi
-}
-wait_for_port() {
-    DELAY=500
-    TOTAL=0
+source $(dirname $(realpath $0))/tools.sh
 
-    while [ 1 ]; do
-        OPEN=`netstat -tln | grep :$1`
-        if [ "$OPEN" != "" ]; then
-            break
-        fi
-
-        if [ "$TOTAL" -gt "60000" ]; then
-            log "/!\ Timeout waiting for port $1 to open"
-            quit
-        fi
-
-        msleep $DELAY
-
-        TOTAL=$(( $TOTAL + $DELAY ))
-    done
-}
 quit() {
     echo
     log "/!\\ Startup failed, stopping Rinkhals..."
@@ -67,10 +17,10 @@ quit() {
 export TZ=UTC
 ntpclient -s -h pool.ntp.org > /dev/null # Try to sync local time before starting
 
-KOBRA_VERSION=`cat /useremain/dev/version`
-RINKHALS_ROOT=`dirname $(realpath $0)`
-RINKHALS_VERSION=`cat $RINKHALS_ROOT/.version`
-RINKHALS_HOME=/useremain/home/rinkhals
+KOBRA_VERSION=$(cat /useremain/dev/version)
+export RINKHALS_ROOT=$(dirname $(realpath $0))
+export RINKHALS_VERSION=$(cat $RINKHALS_ROOT/.version)
+export RINKHALS_HOME=/useremain/home/rinkhals
 
 if [ "$KOBRA_VERSION" != "2.3.5.3" ]; then
     log "Your printer has firmware $KOBRA_VERSION. This Rinkhals version is only compatible with Kobra firmware 2.3.5.3, stopping startup"
@@ -86,7 +36,7 @@ mkdir -p ./logs
 if [ ! -f /tmp/rinkhals-bootid ]; then
     echo $RANDOM > /tmp/rinkhals-bootid
 fi
-BOOT_ID=`cat /tmp/rinkhals-bootid`
+BOOT_ID=$(cat /tmp/rinkhals-bootid)
 
 log
 log "[$BOOT_ID] Starting Rinkhals..."
@@ -117,9 +67,10 @@ log "| Rinkhals home: $RINKHALS_HOME"
 log " --------------------------------------------------"
 echo
 
-REMOTE_MODE=`cat /useremain/dev/remote_ctrl_mode`
+REMOTE_MODE=$(cat /useremain/dev/remote_ctrl_mode)
 if [ "$REMOTE_MODE" != "lan" ]; then
-    log "LAN mode is disabled, some functions might not work properly"
+    log "/!\ LAN mode is disabled, some functions might not work properly"
+    echo
 fi
 
 touch /useremain/rinkhals/.disable-rinkhals
@@ -232,24 +183,6 @@ else
 fi
 
 
-################
-# log "> Starting OctoApp companion..."
-
-# if [ ! -f $RINKHALS_HOME/.disable-octoapp ]; then
-#     # python -m /usr/share/octoapp/moonraker_octoapp "ewogICAgJ0tsaXBwZXJDb25maWdGb2xkZXInOiAnL3VzZXJlbWFpbi9yaW5raGFscy9xdWljay1kZXBsb3kvaG9tZS9yaW5raGFscy9wcmludGVyX2RhdGEvY29uZmlnJywKICAgICdNb29ucmFrZXJDb25maWdGaWxlJzogJy91c2VyZW1haW4vcmlua2hhbHMvcXVpY2stZGVwbG95L2hvbWUvcmlua2hhbHMvcHJpbnRlcl9kYXRhL2NvbmZpZy9tb29ucmFrZXIuY29uZicsCiAgICAnS2xpcHBlckxvZ0ZvbGRlcic6ICcvdXNlcmVtYWluL3JpbmtoYWxzL3F1aWNrLWRlcGxveS9ob21lL3JpbmtoYWxzL3ByaW50ZXJfZGF0YS9sb2dzJywKICAgICdMb2NhbEZpbGVTdG9yYWdlUGF0aCc6ICcvdXNlcmVtYWluL3JpbmtoYWxzL3F1aWNrLWRlcGxveS9ob21lL3JpbmtoYWxzL29jdG9hcHAnLAogICAgJ0lzT2JzZXJ2ZXInIDogZmFsc2UKfQ=="
-
-#     # {
-#     #     'KlipperConfigFolder': '/useremain/rinkhals/quick-deploy/home/rinkhals/printer_data/config',
-#     #     'MoonrakerConfigFile': '/useremain/rinkhals/quick-deploy/home/rinkhals/printer_data/config/moonraker.conf',
-#     #     'KlipperLogFolder': '/useremain/rinkhals/quick-deploy/home/rinkhals/printer_data/logs',
-#     #     'LocalFileStoragePath': '/useremain/rinkhals/quick-deploy/home/rinkhals/octoapp',
-#     #     'IsObserver' : false
-#     # }
-# else
-#     log "/!\ OctoApp companion was disabled by .disable-octoapp"
-# fi
-
-
 ################
 log "> Starting nginx..."
 
@@ -284,7 +217,7 @@ export LD_LIBRARY_PATH=/userdata/app/gk:$LD_LIBRARY_PATH
 sleep 1
 
 ./gkapi &> $RINKHALS_ROOT/logs/gkapi.log &
-./K3SysUi &> $RINKHALS_ROOT/logs/gkui.log &
+./K3SysUi &> $RINKHALS_ROOT/logs/K3SysUi.log &
 
 cd $RINKHALS_ROOT
 

files/4-rinkhals/stop.sh

@@ -2,21 +2,21 @@ function log() {
     echo "${*}"
 
     mkdir -p /useremain/rinkhals/.current/logs
-    echo "`date`: ${*}" >> /useremain/rinkhals/.current/logs/rinkhals.log
+    echo "$(date): ${*}" >> /useremain/rinkhals/.current/logs/rinkhals.log
 }
 function kill_by_name() {
-    PIDS=`ps | grep "$1" | grep -v grep | awk '{print $1}'`
+    PIDS=$(ps | grep "$1" | grep -v grep | awk '{print $1}')
 
-    for PID in `echo "$PIDS"`; do
-        CMDLINE=`cat /proc/$PID/cmdline` 2>/dev/null
+    for PID in $(echo "$PIDS"); do
+        CMDLINE=$(cat /proc/$PID/cmdline) 2>/dev/null
 
         log "Killing $PID ($CMDLINE)"
         kill -9 $PID
     done
 }
 
 
-RINKHALS_ROOT=`dirname $0`
+RINKHALS_ROOT=$(dirname $0)
 
 cd $RINKHALS_ROOT
 mkdir -p ./logs