Menu
▾
▴
[Hyperic-hq-discuss] hq r14534 - in trunk/installer/rpm: . expect
|
From: <cw...@hy...> - 2010-04-22 18:23:24
|
Author: cwitt Date: 2010-04-22 00:46:13 -0700 (Thu, 22 Apr 2010) New Revision: 14534 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14534 Added: trunk/installer/rpm/expect/install_ee.exp Modified: trunk/installer/rpm/ trunk/installer/rpm/expect/install.exp trunk/installer/rpm/noarch-EE.spec trunk/installer/rpm/noarch-dotorg.spec trunk/installer/rpm/x86-EE-server.spec trunk/installer/rpm/x86-server.spec trunk/installer/rpm/x86_64-EE-server.spec trunk/installer/rpm/x86_64-server.spec Log: Resolve issue where hq-install.log was not properly copied into server dir prior to hq-installer destruction. Accounted for lack of click-through license in dotorg in expect script so install no longer hangs. Property changes on: trunk/installer/rpm ___________________________________________________________________ Name: svn:ignore + support_files support_files_EE Modified: trunk/installer/rpm/expect/install.exp =================================================================== --- trunk/installer/rpm/expect/install.exp 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/expect/install.exp 2010-04-22 07:46:13 UTC (rev 14534) @@ -4,8 +4,6 @@ spawn ./setup.sh -expect "accept" -send "y\r" expect "choices" send "1\r" expect "installation path" Added: trunk/installer/rpm/expect/install_ee.exp =================================================================== --- trunk/installer/rpm/expect/install_ee.exp (rev 0) +++ trunk/installer/rpm/expect/install_ee.exp 2010-04-22 07:46:13 UTC (rev 14534) @@ -0,0 +1,19 @@ +#!/usr/bin/expect -f + +set timeout -1 + +spawn ./setup.sh + +expect "accept" +send "y\r" +expect "choices" +send "1\r" +expect "installation path" +send "[lindex $argv 0]\r" +expect { + "send email messages" { + send "\r" + } eof { + exit + } +} Property changes on: trunk/installer/rpm/expect/install_ee.exp ___________________________________________________________________ Name: svn:executable + * Modified: trunk/installer/rpm/noarch-EE.spec =================================================================== --- trunk/installer/rpm/noarch-EE.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/noarch-EE.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,7 +1,7 @@ %define HQ_Component_Name hyperic-hq-agent -%define HQ_Component_Version 4.1.2 +%define HQ_Component_Version 4.2.0.7 %define HQ_Component_Edition EE -%define HQ_Component_Build 1053-noJRE +%define HQ_Component_Build 1285-noJRE %define HQ_Component_Release 1 %define HQ_User hyperic @@ -151,6 +151,16 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 Modified: trunk/installer/rpm/noarch-dotorg.spec =================================================================== --- trunk/installer/rpm/noarch-dotorg.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/noarch-dotorg.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,6 +1,6 @@ %define HQ_Component_Name hyperic-hq-agent -%define HQ_Component_Version 4.1.2 -%define HQ_Component_Build 1053-noJRE +%define HQ_Component_Version 4.2.0.7 +%define HQ_Component_Build 1285-noJRE %define HQ_Component_Release 1 %define HQ_User hyperic @@ -150,6 +150,16 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 Modified: trunk/installer/rpm/x86-EE-server.spec =================================================================== --- trunk/installer/rpm/x86-EE-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86-EE-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,7 +1,7 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 +%define HQ_Component_Version 4.2.0.7 %define HQ_Component_Edition EE -%define HQ_Component_Build 1053-x86-linux +%define HQ_Component_Build 1285-x86-linux %define HQ_Component_Release EE.1 %define HQ_User hyperic @@ -116,12 +116,13 @@ else cd %{prefix}/%{name} installer-%{version}-%{HQ_Component_Edition}/data/hqdb/tune-os.sh > /dev/null 2> /dev/null - /bin/su hyperic -c "expect/install.exp %{prefix}" - #/bin/su hyperic -c "expect/install.exp %{prefix}" > /dev/null 2> /dev/null + /bin/su hyperic -c "expect/install_ee.exp %{prefix}" + #/bin/su hyperic -c "expect/install_ee.exp %{prefix}" > /dev/null 2> /dev/null #echo "%{prefix}/server-current/hqdb/bin/postgres -D %{prefix}/server-current/hqdb/data -i" > %{prefix}/server-%{version}-%{HQ_Component_Edition}/hqdb/data/postmaster.opts cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version}-%{HQ_Component_Edition} server-current" fi +%{__cp} %{prefix}/%{name}/installer-%{version}-%{HQ_Component_Edition}/logs/hq-install.log %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -163,6 +164,26 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Tue Mar 9 2010 Hyperic Support <su...@hy...> 4.2.0 +* Tue Jan 26 2010 Hyperic Support <su...@hy...> 4.2.0 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Wed Dec 16 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4.1 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Thu Oct 1 2009 Hyperic Support <su...@hy...> 4.1.2.1 +* Tue Aug 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Fri May 1 2009 Hyperic Support <su...@hy...> 4.1.1 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 Modified: trunk/installer/rpm/x86-server.spec =================================================================== --- trunk/installer/rpm/x86-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,6 +1,6 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 -%define HQ_Component_Build 1053-x86-linux +%define HQ_Component_Version 4.2.0.7 +%define HQ_Component_Build 1285-x86-linux %define HQ_Component_Release 1 %define HQ_User hyperic @@ -121,6 +121,7 @@ cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version} server-current" fi +%{__cp} %{prefix}/%{name}/installer-%{version}/logs/hq-install.log %{prefix}/server-%{version}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -140,14 +141,14 @@ %{__rm} -f /tmp/hyperic-hq-server-was-running-%{version}-%{release} echo echo "The new version of HQ Server has been started using your existing configuration." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo elif [ -f /etc/init.d/hyperic-hq-server ]; then echo echo "The HQ Server has successfully been installed, and the service has been" echo "configured to start at boot." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo fi @@ -162,6 +163,15 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 Modified: trunk/installer/rpm/x86_64-EE-server.spec =================================================================== --- trunk/installer/rpm/x86_64-EE-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86_64-EE-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,7 +1,7 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 +%define HQ_Component_Version 4.2.0.7 %define HQ_Component_Edition EE -%define HQ_Component_Build 1053-x86_64-linux +%define HQ_Component_Build 1285-x86_64-linux %define HQ_Component_Release EE.1 %define HQ_User hyperic @@ -115,13 +115,13 @@ else cd %{prefix}/%{name} installer-%{version}-%{HQ_Component_Edition}/data/hqdb/tune-os.sh > /dev/null 2> /dev/null - /bin/su hyperic -c "expect/install.exp %{prefix}" - #/bin/su hyperic -c "expect/install.exp %{prefix}" > /dev/null 2> /dev/null + /bin/su hyperic -c "expect/install_ee.exp %{prefix}" + #/bin/su hyperic -c "expect/install_ee.exp %{prefix}" > /dev/null 2> /dev/null #echo "%{prefix}/server-current/hqdb/bin/postgres -D %{prefix}/server-current/hqdb/data -i" > %{prefix}/server-%{version}-%{HQ_Component_Edition}/hqdb/data/postmaster.opts cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version}-%{HQ_Component_Edition} server-current" fi -#%{__cp} %{prefix}/%{name}/installer-3.2.0-EE/hq-install.log %{prefix}/server-%{version}-%{HQ_Component_Edition}/ +%{__cp} %{prefix}/%{name}/installer-%{version}-%{HQ_Component_Edition}/logs/hq-install.log %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -163,6 +163,26 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Tue Mar 9 2010 Hyperic Support <su...@hy...> 4.2.0 +* Tue Jan 26 2010 Hyperic Support <su...@hy...> 4.2.0 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Wed Dec 16 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 19 2009 Hyperic Support <su...@hy...> 4.2.0.1 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Mon Nov 9 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4.1 +* Tue Oct 13 2009 Hyperic Support <su...@hy...> 4.1.4 +* Thu Oct 1 2009 Hyperic Support <su...@hy...> 4.1.2.1 +* Tue Aug 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Fri May 1 2009 Hyperic Support <su...@hy...> 4.1.1 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 Modified: trunk/installer/rpm/x86_64-server.spec =================================================================== --- trunk/installer/rpm/x86_64-server.spec 2010-04-22 04:35:17 UTC (rev 14533) +++ trunk/installer/rpm/x86_64-server.spec 2010-04-22 07:46:13 UTC (rev 14534) @@ -1,6 +1,6 @@ %define HQ_Component_Name hyperic-hq-installer -%define HQ_Component_Version 4.1.2 -%define HQ_Component_Build 1053-x86_64-linux +%define HQ_Component_Version 4.2.0.7 +%define HQ_Component_Build 1285-x86_64-linux %define HQ_Component_Release 1 %define HQ_User hyperic @@ -120,6 +120,7 @@ cd $RPM_BUILD_ROOT/%{prefix} /bin/su hyperic -c "/bin/ln -snf server-%{version} server-current" fi +%{__cp} %{prefix}/%{name}/installer-%{version}/logs/hq-install.log %{prefix}/server-%{version}/hq-install.log %{__rm} -Rf %{prefix}/%{name} %postun @@ -139,14 +140,14 @@ %{__rm} -f /tmp/hyperic-hq-server-was-running-%{version}-%{release} echo echo "The new version of HQ Server has been started using your existing configuration." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo elif [ -f /etc/init.d/hyperic-hq-server ]; then echo echo "The HQ Server has successfully been installed, and the service has been" echo "configured to start at boot." - echo "The installation log can be found in %{prefix}/server-%{version}-%{HQ_Component_Edition}/hq-install.log." + echo "The installation log can be found in %{prefix}/server-%{version}/hq-install.log." echo "Manually starting the HQ Server should be done using the hyperic user." echo fi @@ -161,6 +162,15 @@ %config %{prefix}/hq-plugins %changelog +* Thu Apr 22 2010 Hyperic Support <su...@hy...> 4.2.0.7 +* Sat Jan 23 2010 Hyperic Support <su...@hy...> 4.2.0.4 +* Fri Jan 15 2010 Hyperic Support <su...@hy...> 4.2.0.3 +* Tue Dec 8 2009 Hyperic Support <su...@hy...> 4.2.0.2 +* Thu Nov 5 2009 Hyperic Support <su...@hy...> 4.2.0 +* Thu Jun 25 2009 Hyperic Support <su...@hy...> 4.1.2 +* Thu Jun 11 2009 Hyperic Support <su...@hy...> 4.1.3 +* Wed Jun 10 2009 Hyperic Support <su...@hy...> 4.1.3 +* Tue Jun 9 2009 Hyperic Support <su...@hy...> 4.1.3 * Thu May 7 2009 Hyperic Support <su...@hy...> 4.1.2 * Mon Apr 6 2009 Hyperic Support <su...@hy...> 4.1.1 * Fri Mar 6 2009 Hyperic Support <su...@hy...> 4.1.0 |
