Merge pull request #342 from WhitewaterFoundry/development

Development

Author: crramirez

pengwin-setup.d/hidpi.sh

@@ -3,7 +3,7 @@
 # shellcheck source=./common.sh
 source "$(dirname "$0")/common.sh" "$@"
 
-if (confirm --title "HiDPI" --yesno "Would you like to configure Qt and GDK for HiDPI displays?" 8 85) then
+if (confirm --title "HiDPI" --yesno "Would you like to configure Qt and GTK for HiDPI displays?" 8 85) then
   echo "Installing HiDPI"
   scale_factor=$(wslsys -S -s)
 
@@ -13,7 +13,9 @@ export QT_SCALE_FACTOR=${scale_factor}
 export GDK_SCALE=\$(echo "(\${QT_SCALE_FACTOR} + 0.49) / 1" | bc) #Round
 export GDK_DPI_SCALE=\$(echo "\${QT_SCALE_FACTOR} / \${GDK_SCALE}" | bc -l)
 
-if [ "\$(echo "\${QT_SCALE_FACTOR} >= 1.5" | bc -l)" -eq 1 ]; then
+if [ "\$(echo "\${QT_SCALE_FACTOR} >= 2" | bc -l)" -eq 1 ]; then
+  export XCURSOR_SIZE=64
+elif [ "\$(echo "\${QT_SCALE_FACTOR} >= 1.5" | bc -l)" -eq 1 ]; then
   export XCURSOR_SIZE=32
 else
   export XCURSOR_SIZE=16

pengwin-setup.d/uninstall.sh

@@ -20,7 +20,7 @@ function main() {
       "C++" "Remove Linux C/C++ programming support in Visual Studio and CLion    " off \
       "CASSANDRA" "Remove Cassandra NoSQL server" off \
       "COLORTOOL" "Remove ColorTool console color scheme setter" off \
-      "DO" "Remove Digital Ocean CLI tools" off \
+      "DIGITALOCEAN" "Remove Digital Ocean CLI tools" off \
       "DOCKER" "Remove secure bridge between Pengwin and Docker Desktop" off \
       "DOTNET" "Remove Microsoft's .NET Core SDK and NuGet (if installed)" off \
       "FCITX" "Remove all fcitx improved non-Latin input support" off \
@@ -94,8 +94,8 @@ function main() {
     bash "${UninstallDir}"/colortool.sh "$@"
   fi
 
-  if [[ ${menu_choice} == *"DO"* ]] ; then
-    echo "DO"
+  if [[ ${menu_choice} == *"DIGITALOCEAN"* ]] ; then
+    echo "DIGITALOCEAN"
     bash "${UninstallDir}"/doctl.sh "$@"
   fi
 

rpm/pengwin-setup.d/gui.sh

@@ -12,14 +12,9 @@ function main() {
   local menu_choice=$(
 
     menu --title "GUI Menu" --checklist --separate-output "Install an X server or various other GUI applications\n[SPACE to select, ENTER to confirm]:" 17 99 9 \
-      #"NLI" "Install fcitx or iBus for improved non-Latin input support" off \
       "GUILIB" "Install a base set of libraries for GUI applications" off \
       "HIDPI" "Configure Qt and GTK for HiDPI displays" off \
-      #"STARTMENU" "Generates Windows Start Menu shortcuts for GUI applications" off \
-      #"TERMINAL" "Install Terminals on Windows or WSL for using WSL" off \
-      #"SYNAPTIC" "Install the Synaptic package manager" off \
       "VCXSRV" "Install the VcXsrv open source X-server" off \
-      #"WINTHEME" "Install a Windows 10 theme along with the LXAppearance theme switcher   " off \
       "X410" "Configure X410 to start on Pengwin launch or view a link to install it" off \
 
   3>&1 1>&2 2>&3)

rpm/pengwin-setup.d/services.sh

@@ -149,10 +149,6 @@ function main() {
   local menu_choice=$(
 
     menu --title "Services Menu" --checklist --separate-output "Enables various services\n[SPACE to select, ENTER to confirm]:" 12 70 5 \
-      #"CASSANDRA" "Install the NoSQL server Cassandra from Apache " off \
-      #"KEYCHAIN" "Install Keychain, the OpenSSH key manager" off \
-      #"LAMP" "Install LAMP Stack" off \
-      #"RCLOCAL" "Enable running scripts at startup from rc.local " off \
       "SSH" "Enable SSH server" off \
 
   # shellcheck disable=SC2188

rpm/pengwin-setup.d/uninstall.sh

@@ -13,43 +13,9 @@ function main() {
   local menu_choice=$(
 
     menu --title "Uninstall Menu" --checklist --separate-output "Uninstall applications and packages installed by pengwin-setup\n[SPACE to select, ENTER to confirm]:" 20 95 12 \
-      #"ANSIBLE" "Remove Ansible Playbook deployment tools" off \
-      #"AWS" "Remove AWS CLI tools" off \
-      #"AZURE" "Remove Azure CLI tools" off \
-      #"BASH-RL" "Remove optimized Bash readline settings" off \
-      #"C++" "Remove Linux C/C++ programming support in Visual Studio and CLion    " off \
-      #"CASSANDRA" "Remove Cassandra NoSQL server" off \
-      #"COLORTOOL" "Remove ColorTool console color scheme setter" off \
-      #"DO" "Remove Digital Ocean CLI tools" off \
-      #"DOCKER" "Remove secure bridge between Pengwin and Docker Desktop" off \
-      #"DOTNET" "Remove Microsoft's .NET Core SDK and NuGet (if installed)" off \
-      #"FCITX" "Remove all fcitx improved non-Latin input support" off \
-      #"FISH" "Remove FISH Shell" off \
-      #"GO" "Remove Go language" off \
       "GUILIB" "Remove base GUI application libraries" off \
       "HIDPI" "Remove Qt and GTK HiDPI modifications" off \
-      #"HOMEBREW" "Remove the Homebrew package manager" off \
-      #"IBM" "Remove IBM Cloud CLI tools" off \
-      #"IBUS" "Remove all ibus improved non-Latin input support" off \
-      #"JAVA" "Remove SDKMan its installed Java SDKs" off \
-      #"KEYCHAIN" "Remove Keychain OpenSSH key manager" off \
-      #"KUBERNETES" "Remove Kubernetes tooling" off \
-      #"LAMP" "Remove LAMP stack" off \
-      #"NIM" "Remove choosenim and any installed Nim components" off \
-      #"NODEJS" "Remove Node.js, npm and Yarn (if installed)" off \
-      #"OPENSTACK" "Remove OpenStack CLI tools" off \
-      #"POWERSHELL" "Remove Powershell for Linux" off \
-      #"PYENV" "Remove pyenv, its Python version(s) and modules" off \
-      #"RCLOCAL" "Remove rclocal support (the file /etc/rc.local) is kept" off \
-      #"RUBY" "Remove rbenv, Ruby version(s) and Rails (if installed)" off \
-      #"RUST" "Remove Rust and rustup toolchain installer" off \
-      #"STARTMENU" "Remove all Pengwin generated Windows Start Menu shortcuts" off \
-      #"SSH" "Remove SSH server" off \
-      #"TERRAFORM" "Remove Terraform CLI tools" off \
       "VCXSRV" "Remove VcXsrv X-server" off \
-      #"VSCODE" "Remove Visual Studio Code for Linux" off \
-      #"WINTHEME" "Remove Windows 10 theme and LXAppearance" off \
-      #"WSLTTY" "Remove WSLtty" off \
       "X410" "Remove the X410 X-server autostart" off \
 
   # shellcheck disable=SC2188

tests/ansible.sh

@@ -13,7 +13,7 @@ function testMain() {
 
   command -v /usr/bin/ansible
   assertEquals "Ansible was not installed" "0" "$?"
-  assertEquals "Ansible was not installed" "1" "$(run_command_as_testuser /usr/bin/ansible --version | grep -c '2.9')"
+  assertEquals "Ansible was not installed" "1" "$(run_command_as_testuser /usr/bin/ansible --version | grep -c '2.10')"
 }
 
 function testUninstall() {