convert spaces to tabs

rubikplanet · Aug 15, 2013 · 7382e17 · 7382e17
1 parent 01fa31e
commit 7382e17
Show file tree

Hide file tree

Showing 17 changed files with 228 additions and 227 deletions.
diff --git a/bin/install.ps1 b/bin/install.ps1
@@ -11,9 +11,9 @@ iex (new-object net.webclient).downloadstring($core_url)
 
 # prep
 if(installed 'scoop') {
-    write-host "scoop is already installed. run 'scoop update' to get the latest version." -f red
-    # don't abort if invoked with iex——that would close the PS session
-    if($myinvocation.commandorigin -eq 'Internal') { return } else { exit 1 }
+	write-host "scoop is already installed. run 'scoop update' to get the latest version." -f red
+	# don't abort if invoked with iex——that would close the PS session
+	if($myinvocation.commandorigin -eq 'Internal') { return } else { exit 1 }
 }
 $dir = ensure (versiondir 'scoop' 'current')
 

diff --git a/bin/uninstall.ps1 b/bin/uninstall.ps1
@@ -9,17 +9,17 @@ if($yn -notlike 'y*') { exit }
 
 # run uninstallers if necessary
 installed_apps | % {
-    $app = $_
-    $version = current_version $app
-    $dir = versiondir $app $version
-    $manifest = installed_manifest $app $version
-    $install = install_info $app $version
-    $architecture = $install.architecture
+	$app = $_
+	$version = current_version $app
+	$dir = versiondir $app $version
+	$manifest = installed_manifest $app $version
+	$install = install_info $app $version
+	$architecture = $install.architecture
 
-    echo "uninstalling $app"
-    run_uninstaller $manifest $architecture $dir
-    rm_env_path $manifest $dir
-    rm_env $manifest
+	echo "uninstalling $app"
+	run_uninstaller $manifest $architecture $dir
+	rm_env_path $manifest $dir
+	rm_env $manifest
 }
 
 if(test-path $scoopdir) {

diff --git a/lib/buckets.ps1 b/lib/buckets.ps1
@@ -1,53 +1,53 @@
 $bucketsdir = "$scoopdir\buckets"
 
 function bucketdir($name) {
-    if(!$name) { return relpath "..\bucket" } # main bucket
+	if(!$name) { return relpath "..\bucket" } # main bucket
 
-    "$bucketsdir\$name"
+	"$bucketsdir\$name"
 }
 
 function known_bucket_repo($name) {
-    $dir = versiondir 'scoop' 'current'
-    $json = "$dir\buckets.json"
-    $buckets = gc $json -raw | convertfrom-json -ea stop
-    $buckets.$name
+	$dir = versiondir 'scoop' 'current'
+	$json = "$dir\buckets.json"
+	$buckets = gc $json -raw | convertfrom-json -ea stop
+	$buckets.$name
 }
 
 function apps_in_bucket($dir) {
-    gci $dir | ? { $_.name.endswith('.json') } | % { $_ -replace '.json$', '' }
+	gci $dir | ? { $_.name.endswith('.json') } | % { $_ -replace '.json$', '' }
 }
 
 function buckets {
-    $buckets = @()
-    if(test-path $bucketsdir) {
-        gci $bucketsdir | % { $buckets += $_.name }
-    }
-    $buckets
+	$buckets = @()
+	if(test-path $bucketsdir) {
+		gci $bucketsdir | % { $buckets += $_.name }
+	}
+	$buckets
 }
 
 function find_manifest($app) {
-    @($null) + @(buckets) | % { # null for main bucket
-        $manifest = manifest $app $_
-        if($manifest) { return $manifest, $_ }
-    }
+	@($null) + @(buckets) | % { # null for main bucket
+		$manifest = manifest $app $_
+		if($manifest) { return $manifest, $_ }
+	}
 }
 
 <#
 # convert an object to a hashtable
 function hashtable($obj) {
-    $h = @{ }
-    $obj.psobject.properties | % {
-        $h[$_.name] = hashtable_val($_.value);
-    }
-    return $h
+	$h = @{ }
+	$obj.psobject.properties | % {
+		$h[$_.name] = hashtable_val($_.value);
+	}
+	return $h
 }
 function hashtable_val($obj) {
-    if($obj -is [object[]]) {
-        return $_.value | % { hashtable_val($_) }
-    }
-    if($obj.gettype().name -eq 'pscustomobject') { # -is is unreliable
-        return hashtable($obj)
-    }
-    return $obj # assume primitive
+	if($obj -is [object[]]) {
+		return $_.value | % { hashtable_val($_) }
+	}
+	if($obj.gettype().name -eq 'pscustomobject') { # -is is unreliable
+		return hashtable($obj)
+	}
+	return $obj # assume primitive
 }
 #>
diff --git a/lib/commands.ps1 b/lib/commands.ps1
@@ -7,7 +7,7 @@ function commands {
 }
 
 function command_name($filename) {
-    $filename.name | sls 'scoop-(.*?)\.ps1$' | % { $_.matches[0].groups[1].value }
+	$filename.name | sls 'scoop-(.*?)\.ps1$' | % { $_.matches[0].groups[1].value }
 }
 
 function exec($cmd, $arguments) {

diff --git a/lib/decompress.ps1 b/lib/decompress.ps1
@@ -1,23 +1,23 @@
 function 7zip_installed {
-    try { gcm 7z -ea stop } catch { return $false }
-    $true
+	try { gcm 7z -ea stop } catch { return $false }
+	$true
 }
 
 function requires_7zip($fname) {
-    $fname -match '(\.gz)|(\.tar)|(\.lzma)|(\.7z)$'
+	$fname -match '(\.gz)|(\.tar)|(\.lzma)|(\.7z)$'
 }
 
 function extract_7zip($path, $to, $recurse) {
-    if(!$recurse) { write-host "extracting..." -nonewline }
-    $output = 7z x "$path" -o"$to" -y
-    if($lastexitcode -ne 0) { abort "exit code was $lastexitcode" }
+	if(!$recurse) { write-host "extracting..." -nonewline }
+	$output = 7z x "$path" -o"$to" -y
+	if($lastexitcode -ne 0) { abort "exit code was $lastexitcode" }
 
-    # recursively extract files, e.g. for .tar.gz
-    $output | sls '^Extracting\s+(.*)$' | % {
-        $fname = $_.matches[0].groups[1].value
-        if(requires_7zip $fname) { extract_7zip "$to\$fname" $to $true }
-    }
+	# recursively extract files, e.g. for .tar.gz
+	$output | sls '^Extracting\s+(.*)$' | % {
+		$fname = $_.matches[0].groups[1].value
+		if(requires_7zip $fname) { extract_7zip "$to\$fname" $to $true }
+	}
 
-    rm $path
-    if(!$recurse) { write-host "done" }
+	rm $path
+	if(!$recurse) { write-host "done" }
 }
diff --git a/lib/help.ps1 b/lib/help.ps1
@@ -12,5 +12,5 @@ function help($text) {
 }
 
 function my_usage { # gets usage for the calling script
-    usage (gc $myInvocation.PSCommandPath -raw)
+	usage (gc $myInvocation.PSCommandPath -raw)
 }
diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -19,35 +19,35 @@ function dl_progress($url, $to) {
 
 	$wc = new-object net.webclient
 	register-objectevent $wc downloadprogresschanged progress | out-null
-    register-objectevent $wc downloadfilecompleted complete | out-null
-    try {
-        $wc.downloadfileasync($url, $to)
-
-        function is_complete {
-            try { get-event complete -ea stop; $true } catch { $false }
-        }
-
-        $last_p = -1
-        while(!(is_complete)) {
-            $e = wait-event progress
-            remove-event progress
-            $p = $e.sourceeventargs.progresspercentage
-            if($p -ne $last_p) {
-            	[console]::cursorleft = $left
-            	write-host "$p%" -nonewline
-            	$last_p = $p
-            }
-        }
-        remove-event complete
-    } finally {
-        remove-event *
-        unregister-event progress
-        unregister-event complete
-        
-        $wc.cancelasync()
-        $wc.dispose()
-    }
-    [console]::cursorleft = $left
+	register-objectevent $wc downloadfilecompleted complete | out-null
+	try {
+		$wc.downloadfileasync($url, $to)
+
+		function is_complete {
+			try { get-event complete -ea stop; $true } catch { $false }
+		}
+
+		$last_p = -1
+		while(!(is_complete)) {
+			$e = wait-event progress
+			remove-event progress
+			$p = $e.sourceeventargs.progresspercentage
+			if($p -ne $last_p) {
+				[console]::cursorleft = $left
+				write-host "$p%" -nonewline
+				$last_p = $p
+			}
+		}
+		remove-event complete
+	} finally {
+		remove-event *
+		unregister-event progress
+		unregister-event complete
+		
+		$wc.cancelasync()
+		$wc.dispose()
+	}
+	[console]::cursorleft = $left
 }
 
 function dl_urls($app, $version, $manifest, $architecture, $dir) {

diff --git a/libexec/scoop-bucket.ps1 b/libexec/scoop-bucket.ps1
@@ -24,52 +24,52 @@ $usage_add = "usage: scoop bucket add <name> [<repo>]"
 $usage_rm = "usage: scoop bucket rm <name>"
 
 function add_bucket($name, $repo) {
-    if(!$name) { "<name> missing"; $usage_add; exit 1 }
-    if(!$repo) {
-        $repo = known_bucket_repo $name
-        if(!$repo) { "unknown bucket '$name': try specifying <repo>"; $usage_add; exit 1 }
-    }
+	if(!$name) { "<name> missing"; $usage_add; exit 1 }
+	if(!$repo) {
+		$repo = known_bucket_repo $name
+		if(!$repo) { "unknown bucket '$name': try specifying <repo>"; $usage_add; exit 1 }
+	}
 
-    $git = try { gcm 'git' -ea stop } catch { $null }
-    if(!$git) {
-        abort "git is required for buckets. run 'scoop install git'."
-    }
+	$git = try { gcm 'git' -ea stop } catch { $null }
+	if(!$git) {
+		abort "git is required for buckets. run 'scoop install git'."
+	}
 
-    $dir = bucketdir $name
-    if(test-path $dir) {
-        abort "'$name' bucket already exists. use 'scoop bucket rm $name' to remove it."
-    }
+	$dir = bucketdir $name
+	if(test-path $dir) {
+		abort "'$name' bucket already exists. use 'scoop bucket rm $name' to remove it."
+	}
 
-    write-host 'checking repo...' -nonewline
-    git ls-remote $repo 2>&1 > $null
-    if($lastexitcode -ne 0) {
-        abort "'$repo' doesn't look like a valid git repository"
-    }
-    write-host 'ok'
+	write-host 'checking repo...' -nonewline
+	git ls-remote $repo 2>&1 > $null
+	if($lastexitcode -ne 0) {
+		abort "'$repo' doesn't look like a valid git repository"
+	}
+	write-host 'ok'
 
-    ensure $bucketsdir > $null
-    $dir = ensure $dir
-    git clone "$repo" "$dir"
-    success "$name bucket was added successfully"
+	ensure $bucketsdir > $null
+	$dir = ensure $dir
+	git clone "$repo" "$dir"
+	success "$name bucket was added successfully"
 }
 
 function rm_bucket($name) {
-    if(!$name) { "<name> missing"; $usage_rm; exit 1 }
-    $dir = bucketdir $name
-    if(!(test-path $dir)) {
-        abort "'$name' bucket not found"
-    }
+	if(!$name) { "<name> missing"; $usage_rm; exit 1 }
+	$dir = bucketdir $name
+	if(!(test-path $dir)) {
+		abort "'$name' bucket not found"
+	}
 
-    rm $dir -r -force -ea stop
+	rm $dir -r -force -ea stop
 }
 
 function list_buckets {
-    buckets
+	buckets
 }
 
 switch($cmd) {
-    "add" { add_bucket $name $repo }
-    "rm" { rm_bucket $name }
-    "list" { list_buckets }
-    default { "scoop bucket: cmd '$cmd' not supported"; my_usage; exit 1 }
+	"add" { add_bucket $name $repo }
+	"rm" { rm_bucket $name }
+	"list" { list_buckets }
+	default { "scoop bucket: cmd '$cmd' not supported"; my_usage; exit 1 }
 }
diff --git a/libexec/scoop-cache.ps1 b/libexec/scoop-cache.ps1
@@ -5,16 +5,16 @@ param($cmd, $app)
 . "$psscriptroot\..\lib\help.ps1"
 
 switch($cmd) {
-    'rm' {
-        if(!$app) { 'ERROR: <app> missing'; my_usage; exit 1 }
-        rm "$scoopdir\cache\$app#*"
-    }
-    'show' {
-        gci "$scoopdir\cache" | select name 
-    }
-    default {
-        "cache '$cmd' not supported"; my_usage; exit 1
-    }
+	'rm' {
+		if(!$app) { 'ERROR: <app> missing'; my_usage; exit 1 }
+		rm "$scoopdir\cache\$app#*"
+	}
+	'show' {
+		gci "$scoopdir\cache" | select name 
+	}
+	default {
+		"cache '$cmd' not supported"; my_usage; exit 1
+	}
 }
 
 exit 0