diff options
| author | christianchiarulli <[email protected]> | 2021-09-03 18:38:46 -0400 |
|---|---|---|
| committer | christianchiarulli <[email protected]> | 2021-09-03 18:38:46 -0400 |
| commit | a77e36483b39c09ed39a4cd78de7c240e0f9e9a5 (patch) | |
| tree | a99f503d01f539dfa9ab04106555f0cf3986d77a /utils | |
| parent | 79a4a4295374933617b30ecff8c36bf8f6440d7a (diff) | |
| parent | f82ffdca1fbd7733b42e07b3d68daac4f041985e (diff) | |
Merge branch 'rolling' of github.com:ChristianChiarulli/LunarVim into rolling
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/installer/install.sh | 14 | ||||
| -rw-r--r-- | utils/vscode_config/settings.json | 2 |
2 files changed, 14 insertions, 2 deletions
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" 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" }, |