From 41d40d6c18b6ffaf5132dbc67500214bc6d6d12b Mon Sep 17 00:00:00 2001
From: blueingreen68 <blueingreen68@gmail.com>
Date: Mon, 25 Dec 2023 19:16:00 +0000
Subject: update install.sh

---
 install.sh               | 34 ++--------------------------------
 library/cloneDotfiles.sh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100755 library/cloneDotfiles.sh

diff --git a/install.sh b/install.sh
index 6626d8a..aee8f8f 100755
--- a/install.sh
+++ b/install.sh
@@ -18,36 +18,6 @@ setStatusE () {
 
 setStatusE false
 
-
-openKeepass () {
-  
-  wget https://yadi.sk/d/o4TMFnHFobxTsw -O "$dirArchIsoFiles"/Passwords.kdbx
-
-  setStatusE true
-
-  keepassxc-cli clip "$dirArchIsoFiles"/Passwords.kdbx github 0 -a token-cli
-
-}
-
-cloneDotfiles () {
-
-  while :
-  do openKeepass
-    
-	  if [ $? -eq 0 ]; then
-      setStatusE false
-      break
-	  fi
-
-  echo -e "Пароль скопирован!\n"
-  done
-
-  cd
-  git clone https://blueingreen68@github.com/blueingreen68/.dotfiles
-  wl-copy -c
-
-}
-
 readArrays () {
    readarray -t stowPkgs < <(ls -l "$dotfiles" | grep '^d' | awk '{ print $9 }') 
 }
@@ -328,13 +298,13 @@ startSetup () {
   select event in Yay Stow StowUpdate AddPackage CreateDefaultDirs; do
       case $event in
 		    Yay)
-          source "$dirArchIsoFiles"/yaySetupPkg.sh
+          source "$dirArchIsoFiles"/library/yaySetupPkg.sh
 
           break
 			    ;;
 
         Stow)
-          cloneDotfiles
+          source "$dirArchIsoFiles"/library/cloneDotfiles.sh
           readArrays
           stowPkgExtract
 
diff --git a/library/cloneDotfiles.sh b/library/cloneDotfiles.sh
new file mode 100755
index 0000000..c18712c
--- /dev/null
+++ b/library/cloneDotfiles.sh
@@ -0,0 +1,32 @@
+#!/bin/bash 
+
+openKeepass () {
+  
+  wget https://yadi.sk/d/o4TMFnHFobxTsw -O "$dirArchIsoFiles"/Passwords.kdbx
+
+  setStatusE true
+
+  keepassxc-cli clip "$dirArchIsoFiles"/Passwords.kdbx github 0 -a token-cli
+
+}
+
+cloneDotfiles () {
+
+  while :
+  do openKeepass
+    
+	  if [ $? -eq 0 ]; then
+      setStatusE false
+      break
+	  fi
+
+  echo -e "Пароль скопирован!\n"
+  done
+
+  cd
+  git clone https://blueingreen68@github.com/blueingreen68/.dotfiles
+  wl-copy -c
+
+}
+
+cloneDotfiles
-- 
cgit