Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made the installer able to install Scoop to a folder different of the local and global apps folder #86

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Made the installer able to install Scoop to a folder different of the local and global apps folder #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e01706
Made the installer able to install Scoop to the global directory
DelofJ May 5, 2024
7a45a73
Makes scoop able to be installed anywhere
DelofJ May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@
The installer of Scoop. For details please check the website and wiki.
.PARAMETER ScoopDir
Specifies Scoop root path.
If not specified, Scoop will be installed to '$env:USERPROFILE\scoop'.
If not specified, Scoop will be installed to '$env:LocalAppData\scoop' if ran as admin or '$env:ProgramData\scoop' else.
.PARAMETER ScoopLocalDir
Specifies directory to store local apps.
If not specified, Scoop will be installed to '$env:LocalAppData\scoop'.
.PARAMETER ScoopGlobalDir
Specifies directory to store global apps.
If not specified, global apps will be installed to '$env:ProgramData\scoop'.
Expand All @@ -57,6 +60,7 @@
#>
param(
[String] $ScoopDir,
[String] $ScoopLocalDir,
[String] $ScoopGlobalDir,
[String] $ScoopCacheDir,
[Switch] $NoProxy,
Expand Down Expand Up @@ -434,8 +438,8 @@ function Write-Env {
}

function Add-ShimsDirToPath {
# Get $env:PATH of current user
$userEnvPath = Get-Env 'PATH'
# Get $env:PATH of current user/machine
$userEnvPath = Get-Env 'PATH' -global:$RunAsAdmin

if ($userEnvPath -notmatch [Regex]::Escape($SCOOP_SHIMS_DIR)) {
$h = (Get-PSProvider 'FileSystem').Home
Expand All @@ -451,7 +455,7 @@ function Add-ShimsDirToPath {
}

# For future sessions
Write-Env 'PATH' "$SCOOP_SHIMS_DIR;$userEnvPath"
Write-Env 'PATH' "$SCOOP_SHIMS_DIR;$userEnvPath" -global:$RunAsAdmin
# For current session
$env:PATH = "$SCOOP_SHIMS_DIR;$env:PATH"
}
Expand Down Expand Up @@ -507,11 +511,11 @@ function Add-Config {
}

function Add-DefaultConfig {
# If user-level SCOOP env not defined, save to root_path
if (!(Get-Env 'SCOOP')) {
if ($SCOOP_DIR -ne "$env:USERPROFILE\scoop") {
Write-Verbose "Adding config root_path: $SCOOP_DIR"
Add-Config -Name 'root_path' -Value $SCOOP_DIR | Out-Null
# If user-level SCOOP_LOCAL env not defined, save to root_path
if (!(Get-Env 'SCOOP_LOCAL')) {
if ($SCOOP_LOCAL_DIR -ne "$env:LocalAppData\scoop") {
Write-Verbose "Adding config local_path: $SCOOP_LOCAL_DIR"
Add-Config -Name 'local_path' -Value $SCOOP_LOCAL_DIR | Out-Null
}
}

Expand Down Expand Up @@ -650,25 +654,28 @@ function Write-DebugInfo {
Write-Verbose '-------- PSBoundParameters --------'
$BoundArgs.GetEnumerator() | ForEach-Object { Write-Verbose $_ }
Write-Verbose '-------- Environment Variables --------'
Write-Verbose "`$env:USERPROFILE: $env:USERPROFILE"
Write-Verbose "`$env:LocalAppData: $env:LocalAppData"
Write-Verbose "`$env:ProgramData: $env:ProgramData"
Write-Verbose "`$env:SCOOP: $env:SCOOP"
Write-Verbose "`$env:SCOOP_CACHE: $SCOOP_CACHE"
Write-Verbose "`$env:SCOOP_LOCAL: $env:SCOOP_LOCAL"
Write-Verbose "`$env:SCOOP_GLOBAL: $env:SCOOP_GLOBAL"
Write-Verbose '-------- Selected Variables --------'
Write-Verbose "SCOOP_DIR: $SCOOP_DIR"
Write-Verbose "SCOOP_LOCAL_DIR: $SCOOP_LOCAL_DIR"
Write-Verbose "SCOOP_CACHE_DIR: $SCOOP_CACHE_DIR"
Write-Verbose "SCOOP_GLOBAL_DIR: $SCOOP_GLOBAL_DIR"
Write-Verbose "SCOOP_CONFIG_HOME: $SCOOP_CONFIG_HOME"
}

# Prepare variables
$IS_EXECUTED_FROM_IEX = ($null -eq $MyInvocation.MyCommand.Path)

# Scoop root directory
$SCOOP_DIR = $ScoopDir, $env:SCOOP, "$env:USERPROFILE\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
# Scoop local directory
$SCOOP_LOCAL_DIR = $ScoopLocalDir, $env:SCOOP, "$env:LocalAppData\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
# Scoop global apps directory
$SCOOP_GLOBAL_DIR = $ScoopGlobalDir, $env:SCOOP_GLOBAL, "$env:ProgramData\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
# Scoop root directory
$SCOOP_DIR = $ScoopDir, $env:SCOOP, ($RunAsAdmin ? $SCOOP_GLOBAL_DIR : $SCOOP_LOCAL_DIR) | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
# Scoop cache directory
$SCOOP_CACHE_DIR = $ScoopCacheDir, $env:SCOOP_CACHE, "$SCOOP_DIR\cache" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
# Scoop shims directory
Expand All @@ -678,8 +685,7 @@ $SCOOP_APP_DIR = "$SCOOP_DIR\apps\scoop\current"
# Scoop main bucket directory
$SCOOP_MAIN_BUCKET_DIR = "$SCOOP_DIR\buckets\main"
# Scoop config file location
$SCOOP_CONFIG_HOME = $env:XDG_CONFIG_HOME, "$env:USERPROFILE\.config" | Select-Object -First 1
$SCOOP_CONFIG_FILE = "$SCOOP_CONFIG_HOME\scoop\config.json"
$SCOOP_CONFIG_FILE = "$SCOOP_DIR\config.json"

# TODO: Use a specific version of Scoop and the main bucket
$SCOOP_PACKAGE_REPO = 'https://github.com/ScoopInstaller/Scoop/archive/master.zip'
Expand Down