Merge pull request #171 from kloptops/main

Fixed pm_finish, and font extraction code in PortMaster/funcs.txt.
PortsMaster · Oct 7, 2024 · a14a8fc · a14a8fc
2 parents 6ae7dbe + 717c045
commit a14a8fc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/PortMaster/funcs.txt b/PortMaster/funcs.txt
@@ -17,6 +17,10 @@ export PM_CAN_MOUNT="${PM_CAN_MOUNT:-Y}"
 if [ -f "$controlfolder/pylibs/resources/NotoSans.tar.xz" ]; then
     # TODO: make sure this works on all CFW.
     $ESUDO tar -C "$controlfolder/pylibs/resources" -xf "$controlfolder/pylibs/resources/NotoSans.tar.xz"
+
+    if [ -f "$controlfolder/pylibs/resources/NotoSansJP-Regular.ttf" ]; then
+        $ESUDO rm -f "$controlfolder/pylibs/resources/NotoSans.tar.xz"
+    fi
 fi
 
 if [ -f "$PM_RESOURCE_DIR/do_init" ]; then
@@ -99,5 +103,9 @@ pm_finish() {
     $ESUDO pkill -f gptokeyb
     $ESUDO pkill -f gptokeyb2
 
-    $ESUDO systemctl restart oga_events & 2> /dev/null
+    $ESUDO systemctl restart oga_events 2> /dev/null &
+
+    if [ ! -z "$(echo "$CUR_TTY" | grep -e '^/dev/tty')" ]; then
+        printf "\033c" > "$CUR_TTY"
+    fi
 }