From 4a58346f7b802b9fa7e6e2b94522642ab8a9aa63 Mon Sep 17 00:00:00 2001
From: blueingreen68 <blueingreen68@gmail.com>
Date: Fri, 22 Dec 2023 18:01:56 +0500
Subject: update

---
 install.sh          | 84 +++++++++++++++++++++++++++++++++++++----------------
 patternsHomeDir.txt | 15 ++++++++++
 pkglist.txt         |  1 +
 3 files changed, 75 insertions(+), 25 deletions(-)
 create mode 100644 patternsHomeDir.txt

diff --git a/install.sh b/install.sh
index 642f26a..5c65902 100755
--- a/install.sh
+++ b/install.sh
@@ -3,6 +3,7 @@
 dirArchIsoFiles=~/archisofiles
 dotfiles=~/.dotfiles
 abortedPkgFile=~/.dotfiles/abortedPkg.txt
+patternsHomeDir=~/archisofiles/patternsHomeDir.txt
 counterAbortedPkg=0
 
 setStatusE () {
@@ -131,10 +132,64 @@ createStowPkgDir () {
   packageDir="$dotfiles"/"$namePackage"
 }
 
+selectFile () {
+  select file in ${files[@]}; do 
+
+      if [ -d "$file" ]; then
+          createStowPkgDir
+          cp -r "~/$file" "$packageDir"
+      elif [ -f "$file" ]; then
+          createStowPkgDir
+          cp "~/$file" "$packageDir"
+      fi
+
+  done
+}
+
+addFullPackage () {
+  echo "Это файл из home или .config директории?"
+      select choise in home config; do 
+          case "$choise" in
+              home)
+                echo "Выбери файл или директорию для копирования"
+                readarray files -t < <(ls -lA "$HOME" | grep -v -f "$patternsHomeDir" | awk '{ print $9 }' | sed '/^[[:space:]]*$/d')
+                selectFile
+                
+                break 
+                ;;
+
+              config)
+                echo "Выбери файл или директорию для копирования"
+                readarray files -t < <(ls -lA "$XDG_CONFIG_HOME" | awk '{ print $9 }' | sed '/^[[:space:]]*$/d')
+
+                selectFile
+
+                break 
+                ;;
+
+              *)
+                echo "Invalid option... Выход"
+			          exit
+			          ;;
+          esac
+      done
+
+}
+
+addPackage () {
+  read "Введи название для пакета" -r namePackage
+  if [ "$1" = "full" ]; then
+    addFullPackage
+  elif [ "$1" = "noFolding" ]; then
+    addNoFoldingPackage
+  fi
+
+  }
+
 startSetup () {
   abortedPkg "delete"
 
-  select event in Pacman Stow StowUpdate AddPackage; do
+  select event in Pacman Stow StowUpdate AddFullPackage AddNoFoldingPackage; do
       case $event in
 		    Yay)
           yaySetupPkg
@@ -157,30 +212,9 @@ startSetup () {
           break 
           ;;
 
-        AddPackage)
-          read "Введи название для пакета" -r namePackage
-          echo "Это файл из home или .config директории?"
-          select choise in home config; do 
-            case "$choise" in
-              home)
-                echo "Выбери файл или директорию для копирования"
-                readarray files -t < <(ls -lA | grep -v ^l | awk '{ print $9 }' | sed '/^[[:space:]]*$/d')
-                select file in ${files[@]}; do
-
-                  if [ -d "$file" ]; then
-                    createStowPkgDir
-                    cp -r "~/$file" "$packageDir"
-                  fi
-
-              break
-              ;;
-
-              config)
-              
-              *)
-                echo "Invalid option... Выход"
-			          exit
-			          ;; 
+        AddFullPackage)
+          
+               
             esac
           done
           read "Выбери папку из директории .config" -r dirConfig
diff --git a/patternsHomeDir.txt b/patternsHomeDir.txt
new file mode 100644
index 0000000..caa32e9
--- /dev/null
+++ b/patternsHomeDir.txt
@@ -0,0 +1,15 @@
+^[l-]
+.config
+.dotfiles
+.ssh
+.local
+.cache
+archisofiles
+Downloads
+projects
+video
+torrents
+shotcut
+VirtualBox
+Yandex.Disk
+Music
diff --git a/pkglist.txt b/pkglist.txt
index 229d74e..175e316 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -43,6 +43,7 @@ mpv
 nano
 nautilus
 navi
+nb
 neofetch
 neovim
 network-manager-applet
-- 
cgit