Some path fixes for unix

Ash258 · May 27, 2017 · 5b4b2fc · 5b4b2fc
1 parent 59139ba
commit 5b4b2fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -27,6 +27,7 @@ if(isUnix) {
     $scoopdir = $env:SCOOP, (Join-Path $env:HOME "scoop") | select -first 1
     $globaldir = $env:SCOOP_GLOBAL, "/usr/local/scoop" | select -first 1
     $cachedir = $env:SCOOP_CACHE, (Join-Path $scoopdir "cache") | select -first 1
+    $env:TEMP = "/tmp"
 }
 
 # helper functions

diff --git a/test/00-Project.Tests.ps1 b/test/00-Project.Tests.ps1
@@ -3,9 +3,9 @@ $repo_dir = (Get-Item $MyInvocation.MyCommand.Path).directory.parent.FullName
 $repo_files = @( Get-ChildItem $repo_dir -file -recurse -force )
 
 $project_file_exclusions = @(
-    $([regex]::Escape($repo_dir)+'\\.git\\.*$'),
+    $([regex]::Escape($repo_dir)+'(\\|/).git(\\|/).*$'),
     '.sublime-workspace$',
-    'supporting\\validator\\packages\\*'
+    'supporting(\\|/)validator(\\|/)packages(\\|/)*'
 )
 
 describe 'Project code' {

diff --git a/test/Scoop-Manifest.Tests.ps1 b/test/Scoop-Manifest.Tests.ps1
@@ -5,7 +5,7 @@
 describe "manifest-validation" {
     beforeall {
         $working_dir = setup_working "manifest"
-        $schema = "$psscriptroot\..\schema.json"
+        $schema = "$psscriptroot/../schema.json"
         Add-Type -Path "$psscriptroot\..\supporting\validator\Newtonsoft.Json.dll"
         Add-Type -Path "$psscriptroot\..\supporting\validator\Newtonsoft.Json.Schema.dll"
         Add-Type -Path "$psscriptroot\..\supporting\validator\Scoop.Validator.dll"

diff --git a/test/Scoop-TestLib.ps1 b/test/Scoop-TestLib.ps1
@@ -73,7 +73,7 @@ function setup_working($name) {
     }
 
     # reset working dir
-    $working_dir = "$env:temp\ScoopTestFixtures\$name"
+    $working_dir = "$env:TEMP\ScoopTestFixtures\$name"
     if(test-path $working_dir) {
         Remove-Item -Recurse -Force $working_dir
     }