Skip to content

Commit 718a672

Browse files
daxian-dbwTravisEz13
authored andcommitted
Fix Linux packages (PowerShell#4994)
* Build one deb package for each Debian distro * Build all deb packages with a single run of script
1 parent 464d687 commit 718a672

File tree

3 files changed

+276
-212
lines changed

3 files changed

+276
-212
lines changed

build.psm1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,13 @@ function Get-EnvironmentInformation
131131
$LinuxInfo = Get-Content /etc/os-release -Raw | ConvertFrom-StringData
132132

133133
$environment += @{'LinuxInfo' = $LinuxInfo}
134+
$environment += @{'IsDebian' = $LinuxInfo.ID -match 'debian'}
135+
$environment += @{'IsDebian8' = $Environment.IsDebian -and $LinuxInfo.VERSION_ID -match '8'}
136+
$environment += @{'IsDebian9' = $Environment.IsDebian -and $LinuxInfo.VERSION_ID -match '9'}
134137
$environment += @{'IsUbuntu' = $LinuxInfo.ID -match 'ubuntu'}
135138
$environment += @{'IsUbuntu14' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '14.04'}
136139
$environment += @{'IsUbuntu16' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'}
140+
$environment += @{'IsUbuntu17' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '17.04'}
137141
$environment += @{'IsCentOS' = $LinuxInfo.ID -match 'centos' -and $LinuxInfo.VERSION_ID -match '7'}
138142
$environment += @{'IsFedora' = $LinuxInfo.ID -match 'fedora' -and $LinuxInfo.VERSION_ID -ge 24}
139143
$environment += @{'IsOpenSUSE' = $LinuxInfo.ID -match 'opensuse'}

tools/appimage.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
APP=powershell
3636

3737
# Generate status file for use by apt-get; assuming that the recipe uses no newer
38-
# ingredients than what would require more recent dependencies than what we assume
38+
# ingredients than what would require more recent dependencies than what we assume
3939
# to be part of the base system
4040
generate_status()
4141
{
@@ -60,7 +60,7 @@ delete_blacklisted()
6060
rm -f "${FOUND}"
6161
fi
6262
done
63-
63+
6464
# Do not bundle developer stuff
6565
rm -rf usr/include || true
6666
rm -rf usr/lib/cmake || true
@@ -409,7 +409,7 @@ OPTIONS="-o Debug::NoLocking=1
409409
-o APT::Install-Suggests=0
410410
"
411411

412-
cp ../powershell_*_amd64.deb .
412+
cp ../powershell_*ubuntu.14.04_amd64.deb .
413413

414414
# Add local repository so that we can install deb files
415415
# that were downloaded outside of a repository

0 commit comments

Comments
 (0)