Merge branch 'rolling'1.1.2

1 files changed, 145 insertions, 147 deletions

diff --git a/utils/installer/install.ps1 b/utils/installer/install.ps1
index 526239bb..2df114e5 100644
--- a/utils/installer/install.ps1
+++ b/utils/installer/install.ps1
@@ -2,112 +2,98 @@
 $ErrorActionPreference = "Stop" # exit when command fails
 
 # set script variables
-$LV_BRANCH = ($LV_BRANCH, "rolling", 1 -ne $null)[0]
-$LV_REMOTE = ($LV_REMOTE, "lunarvim/lunarvim.git", 1 -ne $null)[0]
-$INSTALL_PREFIX = ($INSTALL_PREFIX, "$HOME\.local", 1 -ne $null)[0]
+$LV_BRANCH = $LV_BRANCH ?? "rolling"
+$LV_REMOTE = $LV_REMOTE ??  "lunarvim/lunarvim.git"
+$INSTALL_PREFIX = $INSTALL_PREFIX ?? "$HOME\.local"
 
-$env:XDG_DATA_HOME = ($env:XDG_DATA_HOME, "$env:APPDATA", 1 -ne $null)[0]
-$env:XDG_CONFIG_HOME = ($env:XDG_CONFIG_HOME, "$env:LOCALAPPDATA", 1 -ne $null)[0]
-$env:XDG_CACHE_HOME = ($env:XDG_CACHE_HOME, "$env:TEMP", 1 -ne $null)[0]
-$env:LUNARVIM_RUNTIME_DIR = ($env:LUNARVIM_RUNTIME_DIR, "$env:XDG_DATA_HOME\lunarvim", 1 -ne $null)[0]
-$env:LUNARVIM_CONFIG_DIR = ($env:LUNARVIM_CONFIG_DIR, "$env:XDG_CONFIG_HOME\lvim", 1 -ne $null)[0]
-$env:LUNARVIM_CACHE_DIR = ($env:LUNARVIM_CACHE_DIR, "$env:XDG_CACHE_HOME\lvim", 1 -ne $null)[0]
+$env:XDG_DATA_HOME = $env:XDG_DATA_HOME ?? $env:APPDATA
+$env:XDG_CONFIG_HOME = $env:XDG_CONFIG_HOME ?? $env:LOCALAPPDATA
+$env:XDG_CACHE_HOME = $env:XDG_CACHE_HOME ?? $env:TEMP
 
+$env:LUNARVIM_RUNTIME_DIR = $env:LUNARVIM_RUNTIME_DIR ?? "$env:XDG_DATA_HOME\lunarvim"
+$env:LUNARVIM_CONFIG_DIR = $env:LUNARVIM_CONFIG_DIR ?? "$env:XDG_CONFIG_HOME\lvim"
+$env:LUNARVIM_CACHE_DIR = $env:LUNARVIM_CACHE_DIR ?? "$env:XDG_CACHE_HOME\lvim"
+$env:LUNARVIM_BASE_DIR = $env:LUNARVIM_BASE_DIR ?? "$env:LUNARVIM_RUNTIME_DIR\lvim"
 
 $__lvim_dirs = (
-    "$env:LUNARVIM_CONFIG_DIR",
-    "$env:LUNARVIM_RUNTIME_DIR",
-    "$env:LUNARVIM_CACHE_DIR"
+    $env:LUNARVIM_BASE_DIR,
+    $env:LUNARVIM_RUNTIME_DIR,
+    $env:LUNARVIM_CONFIG_DIR,
+    $env:LUNARVIM_CACHE_DIR
 )
 
-function main($cliargs) {
-    Write-Output "  
+function __add_separator($div_width) {
+    "-" * $div_width
+    Write-Output ""
+}
 
-		88\                                                   88\               
-		88 |                                                  \__|              
-		88 |88\   88\ 888888$\   888888\   888888\ 88\    88\ 88\ 888888\8888\  
-		88 |88 |  88 |88  __88\  \____88\ 88  __88\\88\  88  |88 |88  _88  _88\ 
-		88 |88 |  88 |88 |  88 | 888888$ |88 |  \__|\88\88  / 88 |88 / 88 / 88 |
-		88 |88 |  88 |88 |  88 |88  __88 |88 |       \88$  /  88 |88 | 88 | 88 |
-		88 |\888888  |88 |  88 |\888888$ |88 |        \$  /   88 |88 | 88 | 88 |
-		\__| \______/ \__|  \__| \_______|\__|         \_/    \__|\__| \__| \__|
-  
-  "
-  
+function msg($text){
+    Write-Output $text
     __add_separator "80"
-  
-    # skip this in a Github workflow
-    if ( $null -eq "$GITHUB_ACTIONS" ) {
-        install_packer
-        setup_shim
+}
+
+function main($cliargs) {
+
+    print_logo
+
+    verify_lvim_dirs
+
+    if ($cliargs.Contains("--overwrite")) {
+        Write-Output "!!Warning!! -> Removing all lunarvim related config because of the --overwrite flag"
+        $answer = Read-Host "Would you like to continue? [y]es or [n]o "
+        if ("$answer" -ne "y" -and "$answer" -ne "Y") {
+            exit 1
+        }
+        uninstall_lvim
+    }
+    if ($cliargs.Contains("--local") -or $cliargs.Contains("--testing")) {
+        msg "Using local LunarVim installation"
+        local_install
         exit
     }
 
-    __add_separator "80"
-
+    msg "Checking dependencies.."
     check_system_deps
 
-    Write-Output "Would you like to check lunarvim's NodeJS dependencies?"
-    $answer = Read-Host "[y]es or [n]o (default: no) "
+    $answer = Read-Host "Would you like to check lunarvim's NodeJS dependencies? [y]es or [n]o (default: no) "
     if ("$answer" -eq "y" -or "$answer" -eq "Y") {
         install_nodejs_deps
-    } 
+    }
 
-    Write-Output "Would you like to check lunarvim's Python dependencies?"
-    $answer = Read-Host "[y]es or [n]o (default: no) "
+    $answer = Read-Host "Would you like to check lunarvim's Python dependencies? [y]es or [n]o (default: no) "
     if ("$answer" -eq "y" -or "$answer" -eq "Y") {
         install_python_deps
-    } 
-
-    __add_separator "80"
+    }
 
-    Write-Output "Backing up old LunarVim configuration"
-    backup_old_config
 
-    __add_separator "80" 
- 
-    verify_lvim_dirs
-  
-    if (Test-Path "$env:LUNARVIM_RUNTIME_DIR\site\pack\packer\start\packer.nvim") {
-        Write-Output "Packer already installed"
-    }
-    else {
-        install_packer
-    }
-  
-    __add_separator "80"
-  
-    if (Test-Path "$env:LUNARVIM_RUNTIME_DIR\lvim\init.lua" ) {
-        Write-Output "Updating LunarVim"
-        update_lvim
+    if (Test-Path "$env:LUNARVIM_BASE_DIR\init.lua" ) {
+        msg "Updating LunarVim"
+        validate_lunarvim_files
     }
     else {
-        if ($cliargs.Contains("--testing")) {
-            copy_local_lvim_repository
-        }
-        else {
-            clone_lvim
-        }
+        msg "Cloning Lunarvim"
+        clone_lvim
         setup_lvim
     }
-  
-    __add_separator "80"
 }
 
 function print_missing_dep_msg($dep) {
     Write-Output "[ERROR]: Unable to find dependency [$dep]"
-    Write-Output "Please install it first and re-run the installer. Try: $RECOMMEND_INSTALL $dep"
+    Write-Output "Please install it first and re-run the installer."
 }
 
+$winget_package_matrix=@{"git" = "Git.Git"; "nvim" = "nvim.nvim"; "make" = "GnuWin32.Make"; "node" = "OpenJS.NodeJS"; "pip" = "Python.Python.3"}
+$scoop_package_matrix=@{"git" = "git"; "nvim" = "neovim-nightly"; "make" = "make"; "node" = "nodejs"; "pip" = "python3"}
+
 function install_system_package($dep) {
     if (Get-Command -Name "winget" -ErrorAction SilentlyContinue) {
-        Write-Output "[INFO]: Attempting to install dependency [$dep] with winget"
-        $install_cmd = "winget install --interactive"
+        Write-Output "Attempting to install dependency [$dep] with winget"
+        $install_cmd = "winget install --interactive $winget_package_matrix[$dep]"
     }
     elseif (Get-Command -Name "scoop" -ErrorAction SilentlyContinue) {
-        Write-Output "[INFO]: Attempting to install dependency [$dep] with scoop"
+        Write-Output "Attempting to install dependency [$dep] with scoop"
         # TODO: check if it's fine to not run it with --global
-        $install_cmd = "scoop install"
+        $install_cmd = "scoop install $scoop_package_matrix[$dep]"
     }
     else {
         print_missing_dep_msg "$dep"
@@ -115,7 +101,7 @@ function install_system_package($dep) {
     }
 
     try {
-        Invoke-Command $install_cmd $dep -ErrorAction Stop
+        Invoke-Command $install_cmd -ErrorAction Stop
     }
     catch {
         print_missing_dep_msg "$dep"
@@ -124,19 +110,18 @@ function install_system_package($dep) {
 }
 
 function check_system_dep($dep) {
-    try { 
-        Get-Command -Name $dep -ErrorAction Stop | Out-Null 
+    try {
+        Get-Command -Name $dep -ErrorAction Stop | Out-Null
     }
-    catch { 
+    catch {
         install_system_package "$dep"
     }
 }
 
 function check_system_deps() {
-    Write-Output "[INFO]: Checking dependencies.."
     check_system_dep "git"
     check_system_dep "nvim"
-	
+    check_system_dep "make"
 }
 
 function install_nodejs_deps() {
@@ -162,131 +147,144 @@ function install_python_deps() {
 }
 
 function backup_old_config() {
-    foreach ($dir in $__lvim_dirs) {
-        # we create an empty folder for subsequent commands \
-        # that require an existing directory	 
-        if ( Test-Path "$dir") {
-            New-Item "$dir.bak" -ItemType Directory -Force
-            Copy-Item -Recurse "$dir\*" "$dir.bak\."
-        }
+    $src = "$env:LUNARVIM_CONFIG_DIR"
+    if (Test-Path $src) {
+        New-Item "$src.old" -ItemType Directory -Force | Out-Null
+        Copy-Item -Force -Recurse "$src\*" "$src.old\." | Out-Null
     }
-
-    Write-Output "Backup operation complete"
+    msg "Backup operation complete"
 }
 
 
-function install_packer() {
-    Invoke-Command -ErrorAction Stop -ScriptBlock { git clone --progress --depth 1 "https://github.com/wbthomason/packer.nvim" "$env:LUNARVIM_RUNTIME_DIR\site\pack\packer\start\packer.nvim" }
-}
-  
-function copy_local_lvim_repository() {
-    Write-Output "Copy local LunarVim configuration"
-    Copy-Item -Path "$((Get-Item $PWD).Parent.Parent.FullName)" -Destination "$env:LUNARVIM_RUNTIME_DIR/lvim" -Recurse
+function local_install() {
+    verify_lvim_dirs
+    $repoDir = git rev-parse --show-toplevel
+    $gitLocalCloneCmd = git clone --progress "$repoDir" "$env:LUNARVIM_BASE_DIR"
+    Invoke-Command -ErrorAction Stop -ScriptBlock { $gitLocalCloneCmd; setup_lvim }
 }
 
 function clone_lvim() {
-    Write-Output "Cloning LunarVim configuration"
     try {
-        Invoke-Command -ErrorAction Stop -ScriptBlock { git clone --progress --branch "$LV_BRANCH" --depth 1 "https://github.com/$LV_REMOTE" "$env:LUNARVIM_RUNTIME_DIR/lvim" } 
+        $gitCloneCmd = git clone --progress --depth 1 --branch "$LV_BRANCH" `
+                "https://github.com/$LV_REMOTE" `
+                "$env:LUNARVIM_BASE_DIR"
+        Invoke-Command -ErrorAction Stop -ScriptBlock { $gitCloneCmd }
     }
     catch {
-        Write-Output "Failed to clone repository. Installation failed."
+        msg "Failed to clone repository. Installation failed."
         exit 1		
     }
 }
 
 function setup_shim() {
     if ((Test-Path "$INSTALL_PREFIX\bin") -eq $false) {
-        New-Item "$INSTALL_PREFIX\bin" -ItemType Directory
+        New-Item "$INSTALL_PREFIX\bin" -ItemType Directory | Out-Null
     }
-    Copy-Item "$env:LUNARVIM_RUNTIME_DIR\lvim\utils\bin\lvim.ps1" -Destination "$INSTALL_PREFIX\bin\lvim.ps1" -Force
-}
 
-function verify_lvim_dirs() {
-    if ($cliargs.Contains("--overwrite")) {
-        Write-Output "!!Warning!! -> Removing all lunarvim related config because of the --overwrite flag"
-        $answer = Read-Host "Would you like to continue? [y]es or [n]o "
-        if ("$answer" -ne "y" -and "$answer" -ne "Y") {
-            exit 1
-        } 
+    Copy-Item -Force "$env:LUNARVIM_BASE_DIR\utils\bin\lvim.ps1" "$INSTALL_PREFIX\bin\lvim.ps1"
+}
 
-        foreach ($dir in $__lvim_dirs) {
-            if (Test-Path "$dir") {
-                Remove-Item -Force -Recurse "$dir"
-            }
+function uninstall_lvim() {
+    foreach ($dir in $__lvim_dirs) {
+        if (Test-Path "$dir") {
+            Remove-Item -Force -Recurse "$dir"
         }
     }
+}
 
+function verify_lvim_dirs() {
     foreach ($dir in $__lvim_dirs) {
         if ((Test-Path "$dir") -eq $false) {
-            New-Item "$dir" -ItemType Directory
+            New-Item "$dir" -ItemType Directory | Out-Null
         }
     }
-
+    backup_old_config
 }
 
+
 function setup_lvim() {
-    Write-Output "Installing LunarVim shim"
-  
+    msg "Installing LunarVim shim"
     setup_shim
-  
-    Write-Output "Preparing Packer setup"
+
+    msg "Installing sample configuration"
 
     if (Test-Path "$env:LUNARVIM_CONFIG_DIR\config.lua") {
-        Remove-Item -Force "$env:LUNARVIM_CONFIG_DIR\config.lua"
+        Move-Item "$env:LUNARVIM_CONFIG_DIR\config.lua" "$env:LUNARVIM_CONFIG_DIR\config.lua.old"
     }
 
-    Out-File -FilePath "$env:LUNARVIM_CONFIG_DIR\config.lua"
-  
-    Write-Output "Packer setup complete"
-	
-    __add_separator "80"
+    New-Item -ItemType File -Path "$env:LUNARVIM_CONFIG_DIR\config.lua" | Out-Null
 
-    Copy-Item "$env:LUNARVIM_RUNTIME_DIR\lvim\utils\installer\config.example.lua" "$env:LUNARVIM_CONFIG_DIR\config.lua"
-  
-    $answer = Read-Host $(`
-            "Would you like to create an alias inside your Powershell profile?`n" + `
-            "(This enables you to start lvim with the command 'lvim') [y]es or [n]o (default: no)" )
-    if ("$answer" -eq "y" -and "$answer" -eq "Y") {
-        create_alias
-    } 
+    $exampleConfig = "$env:LUNARVIM_BASE_DIR\utils\installer\config_win.example.lua"
+    Copy-Item -Force "$exampleConfig" "$env:LUNARVIM_CONFIG_DIR\config.lua"
 
-    __add_separator "80"
+    # FIXME: this has never worked
+    # Invoke-Expression "$INSTALL_PREFIX\bin\lvim.ps1 --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'"
+
+    Write-Host "Make sure to run `:PackerSync` at first launch" -ForegroundColor Green
+
+    create_alias
+
+    msg "Thank you for installing LunarVim!!"
 
-    Write-Output "Thank you for installing LunarVim!!"
     Write-Output "You can start it by running: $INSTALL_PREFIX\bin\lvim.ps1"
     Write-Output "Do not forget to use a font with glyphs (icons) support [https://github.com/ryanoasis/nerd-fonts]"
 }
 
 
-function update_lvim() {
+function validate_lunarvim_files() {
+    Set-Alias lvim "$INSTALL_PREFIX\bin\lvim.ps1"
     try {
-        Invoke-Command git -C "$env:LUNARVIM_RUNTIME_DIR/lvim" status -uno
+        $verify_version_cmd='if v:errmsg != "" | cquit | else | quit | endif'
+        Invoke-Command -ScriptBlock { lvim --headless -c 'LvimUpdate' -c "$verify_version_cmd" } -ErrorAction SilentlyContinue
     }
     catch {
-        git -C "$env:LUNARVIM_RUNTIME_DIR/lvim" pull --ff-only --progress -or
-        Write-Output "Unable to guarantee data integrity while updating. Please do that manually instead."
+        Write-Output "Unable to guarantee data integrity while updating. Please run `:LvimUpdate` manually instead."
         exit 1
     }
     Write-Output "Your LunarVim installation is now up to date!"
 }
 
-function __add_separator($div_width) {
-    "-" * $div_width
-    Write-Output ""
-}
-
 function create_alias {
-    if ($null -eq $(Get-Alias | Select-String "lvim")) {
-        Add-Content -Path $PROFILE -Value $( -join @('Set-Alias lvim "', "$INSTALL_PREFIX", '\bin\lvim.ps1"'))
-		
-        Write-Output ""
-        Write-Host 'To use the new alias in this window reload your profile with ". $PROFILE".' -ForegroundColor Yellow
+    try {
+        $answer = Read-Host $(`
+                "Would you like to create an alias inside your Powershell profile?`n" + `
+                "(This enables you to start lvim with the command 'lvim') [y]es or [n]o (default: no)" )
+    }
+    catch {
+        msg "Non-interactive mode detected. Skipping alias creation"
+        return
+    }
 
+    if ("$answer" -ne "y" -or "$answer" -ne "Y") {
+        return
     }
-    else {
+
+    $lvim_bin="$INSTALL_PREFIX\bin\lvim.ps1"
+    $lvim_alias = Get-Alias lvim -ErrorAction SilentlyContinue
+
+    if ($lvim_alias.Definition == $lvim_bin) {
         Write-Output "Alias is already set and will not be reset."
+        return
     }
+
+    Add-Content -Path $PROFILE -Value $("Set-Alias lvim $lvim_bin")
+
+    Write-Host 'To use the new alias in this window reload your profile with: `. $PROFILE`' -ForegroundColor Green
+}
+
+function print_logo(){
+    Write-Output "
+
+		88\                                                   88\               
+		88 |                                                  \__|              
+		88 |88\   88\ 888888$\   888888\   888888\ 88\    88\ 88\ 888888\8888\  
+		88 |88 |  88 |88  __88\  \____88\ 88  __88\\88\  88  |88 |88  _88  _88\ 
+		88 |88 |  88 |88 |  88 | 888888$ |88 |  \__|\88\88  / 88 |88 / 88 / 88 |
+		88 |88 |  88 |88 |  88 |88  __88 |88 |       \88$  /  88 |88 | 88 | 88 |
+		88 |\888888  |88 |  88 |\888888$ |88 |        \$  /   88 |88 | 88 | 88 |
+		\__| \______/ \__|  \__| \_______|\__|         \_/    \__|\__| \__| \__|
+
+  "
 }
 
 main "$args"