From 67a0ee6fddf4c8ce7c5612ce32de684a0683e3ab Mon Sep 17 00:00:00 2001
From: Abouzar Parvan <abzcoding@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:24:33 +0430
Subject: Fix the installer copy command (#1432)

---
 utils/installer/install.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/installer/install.sh b/utils/installer/install.sh
index c39f6c8e..ec9813cf 100755
--- a/utils/installer/install.sh
+++ b/utils/installer/install.sh
@@ -210,11 +210,23 @@ function backup_old_config() {
     # we create an empty folder for subsequent commands \
     # that require an existing directory
     mkdir -p "$dir" "$dir.bak"
+    touch "$dir/ignore"
     if command -v rsync &>/dev/null; then
       rsync --archive -hh --partial --progress --cvs-exclude \
         --modify-window=1 "$dir"/ "$dir.bak"
     else
-      cp -R "$dir/"* "$dir.bak/."
+      OS="$(uname -s)"
+      case "$OS" in
+        Linux)
+          cp -r "$dir/"* "$dir.bak/."
+          ;;
+        Darwin)
+          cp -R "$dir/"* "$dir.bak/."
+          ;;
+        *)
+          echo "OS $OS is not currently supported."
+          ;;
+      esac
     fi
   done
   echo "Backup operation complete"
-- 
cgit v1.2.3


From 465c97521423cf07b36547d8d59a7e055fb983c7 Mon Sep 17 00:00:00 2001
From: Abouzar Parvan <abzcoding@users.noreply.github.com>
Date: Thu, 2 Sep 2021 05:32:15 +0430
Subject: Fix typo in vscode_config

---
 utils/vscode_config/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/vscode_config/settings.json b/utils/vscode_config/settings.json
index d8a91c0f..2cca67a5 100644
--- a/utils/vscode_config/settings.json
+++ b/utils/vscode_config/settings.json
@@ -362,7 +362,7 @@
         },
         {
           "key": "P",
-          "name": "Push",
+          "name": "Pull",
           "type": "command",
           "command": "git.pull"
         },
-- 
cgit v1.2.3