Reformat Tools

Modules/BuildUtils.psm1

@@ -5,6 +5,7 @@
 Import-Module "$PSScriptRoot/GlobalConfig"
 Import-Module "$PSScriptRoot/GitModule"
 Import-Module "$PSScriptRoot/SourceRepoTools"
+Import-Module "$PSScriptRoot/CommonUtils"
 
 function Get-SudoPrivilege {
     Write-Host "Now checking for root privileges."
@@ -28,22 +29,17 @@ function Get-SudoPrivilege {
 function Install-GlobalDepends {
     Write-Host "Installing Common build dependencies"
 
-    $Env:LC_ALL="C.UTF-8"
+    $env:LC_ALL="C.UTF-8"
 
-    sudo apt-get --yes install git devscripts equivs | Out-Null
-
-    # Assuming Windows has "LingmoOSBuildDeps" directory support
-    $repoPath = Import-LingmoRepo "https://github.com/LingmoOS/LingmoOSBuildDeps.git" "LingmoOSBuildDeps" $true
-    Set-Location $repoPath
-    sudo mk-build-deps -i -t "apt-get -y" -r | Out-Null
+    Start-ShellProcess "sudo" @("apt-get", "--yes", "install", "git devscripts equivs")
 }
 
 function Install-RepoDepends($repoPath) {
-    $Env:LC_ALL="C.UTF-8"
+    $env:LC_ALL="C.UTF-8"
 
     # Assuming Windows has "LingmoOSBuildDeps" directory support
     Set-Location $repoPath
-    sudo mk-build-deps -i -t "apt-get -y" -r | Out-Null
+    Start-ShellProcess "sudo" @("mk-build-deps", "-i -t", "`"apt-get -y`"", "-r")
 }
 
 function Start-CompileDeb($repo) {
@@ -55,7 +51,8 @@ function Start-CompileDeb($repo) {
     Install-RepoDepends $repo.m_repoPath
 
     Write-Host "Build $($repo.repoName) ..."
-    dpkg-buildpackage -b -uc -us -tc -j"$(nproc)" | Out-Null
+    $totalCPUS = (nproc).ToString()
+    Start-ShellProcess "dpkg-buildpackage" @("-b", "-uc", "-us", "-tc", "-j$($totalCPUS)")
 
     Write-Host "$($repo.repoName) Complete!"
 

Modules/CommonUtils.psm1

@@ -0,0 +1,28 @@
+<#
+    .DESCRIPTION
+    Contain commonly used funcions.
+#>
+
+<#
+    .DESCRIPTION
+    Execute a process and throw an error if not exit correctly
+    .OUTPUTS
+    True if sucess. Throw error if failed
+#>
+function Start-ShellProcess {
+    param (
+        [Parameter(Mandatory)]
+        [string] $execName,
+        [System.Collections.ArrayList] $params
+    )
+
+    $proc = Start-Process $execName -ArgumentList $params -Wait -PassThru
+
+    if ($proc.ExitCode -ne 0) {
+        # 如果非正常结束，就会报错
+        throw "Error executing $($repoURL) with param: $($cloneDst)"
+    }
+
+    return $true
+}
+Export-ModuleMember -Function Start-ShellProcess

Modules/GitModule.psm1

@@ -4,6 +4,7 @@
 #>
 
 Import-Module "$PSScriptRoot/GlobalConfig"
+Import-Module "$PSScriptRoot/CommonUtils"
 
 <#
     .DESCRIPTION
@@ -44,9 +45,11 @@ function Import-LingmoRepo {
     Remove-DirIfExist $cloneDst
 
     if ($cloneDevGit -eq $true) {
-        git clone $repoURL $cloneDst | Out-Null
+        $params = @("clone", "$($repoURL)", "$($cloneDst)")
+        $ret = Start-ShellProcess "git" $params
     } else {
-        git clone -b $Tag $repoURL $cloneDst | Out-Null
+        $params = @("clone", "-b", "$($Tag)", "$($repoURL)", "$($cloneDst)")
+        $ret = Start-ShellProcess "git" $params
     }
 
     return $cloneDst

Modules/SourceRepoTools.psm1

@@ -101,9 +101,9 @@ function Get-AllRepoConfigs {
         $fullPath = "$(Get-ConfigPath)/$name"
         $item = Get-ConfigFromFile $fullPath $cloneDevGit
         if ($clone) {
-            $item.CloneRepo() | Out-Null
+            $item.CloneRepo()
         }
-        $results.Add($item) | Out-Null
+        $results.Add($item)
     }
 
     return $results

build.ps1

@@ -15,6 +15,7 @@ $LingMainScriptPath = $MyInvocation.MyCommand.Definition
 $LingMainScriptDirectory  = Split-Path $LingMainScriptPath -Parent
 
 # Import modules
+Import-Module (Join-Path $LingMainScriptDirectory "/Modules/CommonUtils")
 Import-Module (Join-Path $LingMainScriptDirectory "/Modules/GlobalConfig")
 Import-Module (Join-Path $LingMainScriptDirectory "/Modules/GitModule")
 Import-Module (Join-Path $LingMainScriptDirectory "/Modules/SourceRepoTools")