diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7cbdf04..dfdc41d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,9 +48,9 @@ jobs: sudo apt-get install -q -y bash curl sudo curl -sSL -o /usr/local/bin/shunit2 https://raw.githubusercontent.com/kward/shunit2/master/shunit2 sudo chmod +x /usr/local/bin/shunit2 - sudo curl -sSLO https://github.com/koalaman/shellcheck/releases/download/v0.8.0/shellcheck-v0.8.0.linux.x86_64.tar.xz - sudo tar -xf shellcheck-v0.8.0.linux.x86_64.tar.xz - sudo mv shellcheck-v0.8.0/shellcheck /usr/local/bin/ + sudo curl -sSLO https://github.com/koalaman/shellcheck/releases/download/v0.9.0/shellcheck-v0.9.0.linux.x86_64.tar.xz + sudo tar -xf shellcheck-v0.9.0.linux.x86_64.tar.xz + sudo mv shellcheck-v0.9.0/shellcheck /usr/local/bin/ sudo chmod +x /usr/local/bin/shellcheck # Shellcheck Tests - name: Run shellcheck testing @@ -114,9 +114,9 @@ jobs: sudo apt-get install -q -y bash curl sudo curl -sSL -o /usr/local/bin/shunit2 https://raw.githubusercontent.com/kward/shunit2/master/shunit2 sudo chmod +x /usr/local/bin/shunit2 - sudo curl -sSLO https://github.com/koalaman/shellcheck/releases/download/v0.8.0/shellcheck-v0.8.0.linux.x86_64.tar.xz - sudo tar -xf shellcheck-v0.8.0.linux.x86_64.tar.xz - sudo mv shellcheck-v0.8.0/shellcheck /usr/local/bin/ + sudo curl -sSLO https://github.com/koalaman/shellcheck/releases/download/v0.9.0/shellcheck-v0.9.0.linux.x86_64.tar.xz + sudo tar -xf shellcheck-v0.9.0.linux.x86_64.tar.xz + sudo mv shellcheck-v0.9.0/shellcheck /usr/local/bin/ sudo chmod +x /usr/local/bin/shellcheck # Shellcheck Tests - name: Run shellcheck testing diff --git a/shunit2/run_test.sh b/shunit2/run_test.sh index 60708be..991ec55 100755 --- a/shunit2/run_test.sh +++ b/shunit2/run_test.sh @@ -21,11 +21,11 @@ testEqualityGetDistribName() assertEquals "ubuntu" "${distrib_name}" } -testEqualityGetReleaseName() -{ - release_name=$(get_release_name) - assertEquals "focal" "${release_name}" -} +#testEqualityGetReleaseName() +#{ +# release_name=$(get_release_name) +# assertEquals "focal" "${release_name}" +#} testEqualityCreateAccount() { @@ -70,6 +70,14 @@ testEqualityInstallMySQL() assertEquals "/usr/sbin/mysqld" "${mysqld_bin}" } +testTrueInstallPostgres() +{ + . scripts/install_postgres.sh + + pgs=$(command -v postgres | grep -c postgres) + assertTrue "[[ ${pgs} -gt 0 ]]" +} + testTrueInstallImageMagick() { . scripts/install_imagemagick.sh