From 0c20ec012099748cbaff6959f8a7c62a56c1d645 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Tue, 20 Oct 2020 21:41:37 -0500
Subject: [PATCH] preload

---
 gui | 46 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

diff --git a/gui b/gui
index de33178..3d9762c 100755
--- a/gui
+++ b/gui
@@ -9,56 +9,30 @@ function error {
 [ -z "$(yad --help)" ] && error "YAD needs to be installed to run pi-apps."
 
 #check for updates in background
-"${DIRECTORY}/updater" 1>/dev/null  &
+("${DIRECTORY}/updater" 1>/dev/null) &
 
-mkdir -p "${DIRECTORY}/data/installed-packages" "${DIRECTORY}/data/status"
+(mkdir -p "${DIRECTORY}/data/installed-packages" "${DIRECTORY}/data/status") &
 
 #create hidelist file if nonexistent
-if [ ! -f "${DIRECTORY}/data/hidelist" ];then
+(if [ ! -f "${DIRECTORY}/data/hidelist" ];then
   echo 'template' > "${DIRECTORY}/data/hidelist"
-fi
+fi) &
 
-#Variable 1 is used to view the details of the specefied app
+#Variable 1 is used to view the details of the specified app
 if [ ! -z "$1" ];then
   output="$1"
 fi
 
-while true;do
-  #get list of apps ----------------------------------- and exclude apps mentioned in hidelist file
-  APPS="$(echo "$(ls "${DIRECTORY}/apps")" | grep -vxE "$(cat "${DIRECTORY}/data/hidelist" | tr '\n' '|')")"
-  #APPS="$(echo "$(ls "${DIRECTORY}/apps")")"
-  
-  
-  #shuffle the list if enabled
-  if [ "$(cat "${DIRECTORY}/data/settings/Shuffle App list")" == 'Yes' ];then
-    APPS="$(echo "$APPS" | shuf)"
-  fi
-  
-  echo -e "$APPS\n"
-  
-  APPS="$(echo "$APPS" | tr '\n' '|')"
 
-  PREIFS="$IFS"
-  IFS="|"
-  LIST=''
-  for i in $APPS
-  do
-    
-    LIST="$LIST$(echo "${DIRECTORY}/icons/$(cat "${DIRECTORY}/data/status/${i}" || echo "none").png")
-${DIRECTORY}/apps/${i}/icon-24.png
-$i
-"\("$(cat "${DIRECTORY}/data/status/${i}" || echo "uninstalled")"\)" $(echo "$(cat "${DIRECTORY}/apps/${i}/description" || echo "Description unavailable")" | head -n1)
-"
-  done
-  IFS="$PREIFS"
-  LIST="$(echo -e "$LIST")"
+while true;do
+  LIST="$("${DIRECTORY}/preload")"
+  #LIST="$(cat "${DIRECTORY}/data/preload/LIST")"
   #echo "$LIST"
   
   #if output is not empty then assume button pressed was Details
   button=0
   
-  while [ -z "$output" ]
-  do
+  while [ -z "$output" ];do
     
     output="$(echo -e "$LIST" | yad --center --title='Pi-Apps' --width=310 --height=300 --no-headers \
       --list --separator='\n' --window-icon="${DIRECTORY}/icons/logo.png" \
@@ -66,7 +40,7 @@ $i
       --button=Install!"${DIRECTORY}/icons/install.png":4 \
       --button=Uninstall!"${DIRECTORY}/icons/uninstall.png":2 \
       --button=Details!"${DIRECTORY}/icons/info.png"!'View more about the selected software:0' \
-      2>/dev/null)"
+      )"
     
     button=$? #get exit code to determine which button was pressed
     echo "Button: ${button}"