From 707585e6c08b4a4901898981382bbc0d2b0a8af2 Mon Sep 17 00:00:00 2001
From: "Hairo R. Carela" <hairocr8@gmail.com>
Date: Fri, 8 Aug 2025 21:47:08 -0400
Subject: [PATCH] rgnano: Change ROCKBOX_DIR to /mnt/FunKey/.rockbox

For consistency's sake.

Change-Id: Ia2ef27dceaf143ab85adb22581c6461d50914a84
---
 manual/getting_started/installation.tex |  2 +-
 packaging/rgnano/config.cfg             |  2 +-
 packaging/rgnano/run.sh                 | 11 +++++++++--
 tools/configure                         |  2 +-
 wps/WPSLIST                             |  2 +-
 wps/cabbiev2.240x240x16.wps             | 10 +++-------
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 0bfb31d9c6..2008fc2b91 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -1043,7 +1043,7 @@ need to be updated.\\
   You can uninstall Rockbox simply by removing:
   \begin{itemize}
   \item The \fname{Applications/rockbox-funkey-s.opk} file.
-  \item The \fname{FunKey/rockbox} folder.
+  \item The \fname{FunKey/.rockbox} folder.
   \end{itemize}
   in the microSD card of your \dap{}.
 }
diff --git a/packaging/rgnano/config.cfg b/packaging/rgnano/config.cfg
index 36ccc7389b..cea2221712 100644
--- a/packaging/rgnano/config.cfg
+++ b/packaging/rgnano/config.cfg
@@ -1,7 +1,7 @@
 # .cfg file created by rockbox c145f41658-250621 - http://www.rockbox.org
 
 idle poweroff: 0
-font: /FunKey/rockbox/fonts/16-WenQangYi-Unibit.fnt
+font: /FunKey/.rockbox/fonts/16-GNU-Unifont.fnt
 database scan paths: /Music
 qs top: brightness
 qs bottom: brightness
diff --git a/packaging/rgnano/run.sh b/packaging/rgnano/run.sh
index 0372f4d7ea..e0b9d40f75 100755
--- a/packaging/rgnano/run.sh
+++ b/packaging/rgnano/run.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-RBDIR=/mnt/FunKey/rockbox
+RBDIR_OLD=/mnt/FunKey/rockbox
+RBDIR=/mnt/FunKey/.rockbox
 CFGFILE=$RBDIR/config.cfg
 BLPATH=/sys/class/backlight/backlight/brightness
 
@@ -9,7 +10,13 @@ _send_sigusr1()
   kill -s USR1 "$rb_pid" 2>/dev/null
 }
 
-# Install the rockbox folder
+# Check if the old folder exists and rename it
+# TODO: Remove this later, maybe when there's a new stable update?
+if [ -d $RBDIR_OLD ]; then
+  mv $RBDIR_OLD $RBDIR
+fi
+
+# Install or update the rockbox folder
 if [ ! -d $RBDIR ]; then
   notif set 0 " Installing rockbox..."
   mkdir -p $RBDIR
diff --git a/tools/configure b/tools/configure
index 3fbceb7dd1..01d6b13854 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1012,7 +1012,7 @@ rgnanocc () {
 
     thread_support="HAVE_SDL_THREADS"
     sdl="$FUNKEY_SDK_PATH/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config"
-    rbdir="/FunKey/rockbox"
+    rbdir="/FunKey/.rockbox"
 }
 
 
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 92bef94504..d26060e70a 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -118,7 +118,7 @@ Font.320x480x(16|24|32): 27-Adobe-Helvetica.fnt
 Font.320x240x(16|24|32): 15-Adobe-Helvetica.fnt
 Font.240x400x(16|24|32): 16-Adobe-Helvetica.fnt
 Font.240x320x(16|24|32): 18-Adobe-Helvetica.fnt
-Font.240x240x(16|24|32): 16-WenQangYi-Unibit.fnt
+Font.240x240x(16|24|32): 16-GNU-Unifont.fnt
 Font.220x176x(16|24|32): 12-Adobe-Helvetica.fnt
 Font.176x220x(16|24|32): 12-Adobe-Helvetica.fnt
 Font.176x132x(16|24|32): 12-Adobe-Helvetica.fnt
diff --git a/wps/cabbiev2.240x240x16.wps b/wps/cabbiev2.240x240x16.wps
index 8517470057..73d955eaef 100644
--- a/wps/cabbiev2.240x240x16.wps
+++ b/wps/cabbiev2.240x240x16.wps
@@ -5,10 +5,6 @@
 # Disable Status Bar
 %wd
 #
-#
-# Preload Fonts
-%Fl(3,14-Rockbox-Mix.fnt)
-#
 # Load Backdrop
 %X(wpsbackdrop-240x240x16.bmp)
 #
@@ -52,7 +48,7 @@
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 #
 # Time Elapsed/Remaining
-%V(10,180,220,20,3)
+%V(10,180,220,20,-)
 %al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
 #
 # Album Art
@@ -61,7 +57,7 @@
 %Cd
 #
 # Track Info - Album Art
-%ax%Vl(a,113,40,-,130,3)
+%ax%Vl(a,113,30,-,130,-)
 %s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
@@ -72,7 +68,7 @@
 %s%al%?Ia<%Ia|%?IA<%IA>>
 #
 # Track Info - No Album Art
-%ax%Vl(b,0,30,-,130,3)
+%ax%Vl(b,0,30,-,130,-)
 %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>