diff options
| author | Heikki Halmet <heikki.halmet@digia.com> | 2013-10-14 14:44:51 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-24 07:21:58 +0200 |
| commit | b9dd43d1d36e1706f30f24d43f761e28a63dd695 (patch) | |
| tree | ebffb0d013376a95ae5771f2ee7a867bb3d13489 | |
| parent | 6a8d992a3213bd8dd8c8c685a03c7aca4955dfed (diff) | |
Squish to OpenSuSE
This will install Squich package to OpenSuSE nodes. Also comment's
are shorted as one line because multiple comment lines caused problems
with puppet for some reason.
Error note was 'invalid byte sequence in UTF-8'.
Change-Id: Ic07a479cc68c2af006338e26fcd93856d18a6a85
Reviewed-by: Tony SarajΓ€rvi <tony.sarajarvi@digia.com>
| -rw-r--r-- | puppet/modules/squish/manifests/init.pp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/puppet/modules/squish/manifests/init.pp b/puppet/modules/squish/manifests/init.pp index 5907827..c5f9c65 100644 --- a/puppet/modules/squish/manifests/init.pp +++ b/puppet/modules/squish/manifests/init.pp @@ -1,6 +1,4 @@ # This cross-platform module downloads the given $version of Squish and installs it to the specified $path. -# If a different squish is already installed, it is uninstalled first. -# Also squish-package will be renamed, not_configured file will be removed and squish license is installed using secret file. class squish { @@ -37,7 +35,7 @@ class squish { default => "squish-5.0.1-qt51x-win32-msvc10", } - $ubuntu_pkg_name = $::architecture ? { + $linux_pkg_name = $::architecture ? { i386 => "squish-5.0.1-qt51x-linux32", default => "squish-5.0.1-qt51x-linux64", } @@ -71,7 +69,15 @@ class squish { Ubuntu: { squish_install { "package": - pkg_name => "$ubuntu_pkg_name", + pkg_name => "$linux_pkg_name", + path => "$path", + version => "5.0.1", + } + } + OpenSuSE: { + squish_install { + "package": + pkg_name => "$linux_pkg_name", path => "$path", version => "5.0.1", } @@ -111,9 +117,7 @@ class squish { require => Unzip_package["$name"], } - # Rename squish package name as '$name' so the path to squish wonοΏ½t change after version update. In Windows nodes the package is named after - # compiler and in other platforms it is named as 'squish' so the environment variables specified in 'squish_env.sh.erb' wonοΏ½t change along - # with platform. 'squish_env.sh' will set environment variables for all other platforms except for Winodws. + # Rename squish package name as '$name' so the path to squish won't change after version update. if $::operatingsystem == 'windows' { exec { "rename $pkg_name as $name": command => "C:\\Windows\\system32\\cmd.exe /C \"rename ${path}\\${pkg_name} $name\"", |