Skip to content

Commit e6e1d15

Browse files
authored
Merge pull request #424 from WhitewaterFoundry/development
Development
2 parents d7be9dc + 3987426 commit e6e1d15

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

pengwin-setup.d/powershell.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
# shellcheck source=common.sh
44
source "$(dirname "$0")/common.sh" "$@"
55

6+
# shellcheck disable=SC2155
7+
declare dist="$(uname -m)"
8+
if [[ ${dist} != "x86_64" ]]; then
9+
message --title "POWERSHELL" --msgbox "PowerShell installation is only supported on x86_64 architecture. Microsoft repositories do not provide PowerShell packages for non-x86_64 architectures." 10 70
10+
echo "Skipping POWERSHELL - not supported on non-x86_64 architecture"
11+
exit 1
12+
fi
13+
unset dist
14+
615
if (confirm --title "POWERSHELL" --yesno "Would you like to download and install Powershell?" 8 55); then
716
echo "Installing POWERSHELL"
817

rpm/pengwin-setup.d/powershell.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
# shellcheck source=common.sh
44
source "$(dirname "$0")/common.sh" "$@"
55

6+
# shellcheck disable=SC2155
7+
declare dist="$(uname -m)"
8+
if [[ ${dist} != "x86_64" ]]; then
9+
message --title "POWERSHELL" --msgbox "PowerShell installation is only supported on x86_64 architecture. Microsoft repositories do not provide PowerShell packages for other architectures." 10 70
10+
echo "Skipping POWERSHELL - not supported on non-x86_64 architecture"
11+
exit 1
12+
fi
13+
unset dist
14+
615
if (confirm --title "POWERSHELL" --yesno "Would you like to download and install Powershell?" 8 55); then
716
echo "Installing POWERSHELL"
817

tests/powershell.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
source commons.sh
44

55
function test_main() {
6+
# shellcheck disable=SC2155
7+
local dist="$(uname -m)"
8+
if [[ ${dist} != "x86_64" ]]; then
9+
return
10+
fi
11+
612
run_pengwinsetup install TOOLS POWERSHELL
713

814
# shellcheck disable=SC2041
@@ -18,6 +24,12 @@ function test_main() {
1824
}
1925

2026
function test_uninstall() {
27+
# shellcheck disable=SC2155
28+
local dist="$(uname -m)"
29+
if [[ ${dist} != "x86_64" ]]; then
30+
return
31+
fi
32+
2133
run_pengwinsetup install UNINSTALL POWERSHELL
2234

2335
# shellcheck disable=SC2041

0 commit comments

Comments
 (0)