diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 36 | ||||
| -rwxr-xr-x | build.sh | 4 | ||||
| -rw-r--r-- | dotnet-version.patch | 4 |
5 files changed, 26 insertions, 32 deletions
@@ -1,7 +1,7 @@ pkgbase = powershell pkgdesc = A cross-platform automation and configuration tool/framework (latest release) - pkgver = 6.0.2 - pkgrel = 3 + pkgver = 6.1.0 + pkgrel = 1 url = https://github.com/PowerShell/PowerShell install = powershell.install arch = x86_64 @@ -10,16 +10,14 @@ pkgbase = powershell makedepends = cmake makedepends = dotnet-sdk>=2.0 depends = icu - source = powershell::git+https://github.com/PowerShell/PowerShell.git#tag=v6.0.2 - source = pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop + source = powershell::git+https://github.com/PowerShell/PowerShell.git#tag=v6.1.0 source = googletest::git+https://github.com/google/googletest.git source = build.sh source = dotnet-version.patch md5sums = SKIP md5sums = SKIP - md5sums = SKIP - md5sums = 477e7fe74b41d814da19ec23db3e620f - md5sums = 835214e5782a09d6be7796d9da3d42f6 + md5sums = 2ddd2c3b33c7df1c85f49fa6f7763566 + md5sums = 5a1e613f80ee8b50c3650bc823298771 pkgname = powershell diff --git a/.gitignore b/.gitignore index 3f598c7740dd..17d2c4ac9a93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ googletest/ pester/ pkg/ -*.xz +*.pkg.tar powershell/ src/ @@ -3,9 +3,9 @@ pkgname=powershell binaryname=pwsh -_pkgver=6.0.2 +_pkgver=6.1.0 pkgver=${_pkgver/-/.} -pkgrel=3 +pkgrel=1 pkgdesc='A cross-platform automation and configuration tool/framework (latest release)' arch=('x86_64') url='https://github.com/PowerShell/PowerShell' @@ -13,21 +13,18 @@ license=('MIT') makedepends=('git' 'cmake' 'dotnet-sdk>=2.0') depends=('icu') source=($pkgname::git+https://github.com/PowerShell/PowerShell.git#tag=v$_pkgver - pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop googletest::git+https://github.com/google/googletest.git build.sh dotnet-version.patch) md5sums=('SKIP' 'SKIP' - 'SKIP' - '477e7fe74b41d814da19ec23db3e620f' - '835214e5782a09d6be7796d9da3d42f6') + '2ddd2c3b33c7df1c85f49fa6f7763566' + '5a1e613f80ee8b50c3650bc823298771') install=powershell.install prepare() { cd $pkgname git submodule init - git config submodule.src/Modules/Pester.url $srcdir/pester git config submodule.src/libpsl-native/test/googletest.url $srcdir/googletest git submodule update git clean -dfx @@ -40,23 +37,24 @@ build() { TERM=xterm $srcdir/build.sh } -check() { - cd $pkgname/src/libpsl-native - make test -} +# TODO: pester has moved, and the testing process has changed +# check() { +# cd $pkgname/src/libpsl-native +# make test +# } package() { - cd $pkgname/src/powershell-unix + cd "$pkgname/src/powershell-unix" - mkdir -p $pkgdir/usr/lib/$pkgname - cp -a bin/Linux/netcoreapp*/linux-x64 $pkgdir/usr/lib/$pkgname - chmod 755 $pkgdir/usr/lib/$pkgname/linux-x64/$binaryname + mkdir -p "$pkgdir/usr/lib/$pkgname" + cp -a "bin/Linux/netcoreapp2.1/linux-x64" "$pkgdir/usr/lib/$pkgname" + chmod 755 "$pkgdir/usr/lib/$pkgname/linux-x64/$binaryname" - mkdir -p $pkgdir/usr/share/licenses/$pkgname - cp ../../LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" + cp ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - mkdir -p $pkgdir/usr/bin - ln -s /usr/lib/$pkgname/linux-x64/$binaryname $pkgdir/usr/bin/$binaryname + mkdir -p "$pkgdir/usr/bin" + ln -s "/usr/lib/$pkgname/linux-x64/$binaryname" "$pkgdir/usr/bin/$binaryname" chmod 644 \ $pkgdir/usr/lib/powershell/linux-x64/libhostfxr.so \ @@ -46,6 +46,4 @@ make -j popd ## Build powershell core -rawRid="$(dotnet --info | grep RID)" -rid=${rawRid##* } # retain the part after the last space -dotnet publish --configuration Linux src/powershell-unix/ --output bin --runtime $rid +dotnet publish --configuration Linux "src/powershell-unix/" --output bin --runtime "linux-x64" diff --git a/dotnet-version.patch b/dotnet-version.patch index 5d5aa5fd0fa6..4d2d0233e1e1 100644 --- a/dotnet-version.patch +++ b/dotnet-version.patch @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ { "sdk": { -- "version": "2.0.2" -+ "version": "2.1.300" +- "version": "2.1.401" ++ "version": "2.1.402" } } |