[26743] in Source-Commits
Re: /svn/athena r25722 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Tue Aug 14 18:19:29 2012
Date: Tue, 14 Aug 2012 18:19:26 -0400 (EDT)
From: Jonathan Reed <jdreed@MIT.EDU>
To: source-commits@MIT.EDU
In-Reply-To: <201208142209.q7EM9M2e021560@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.02.1208141818360.32570@INFINITE-LOOP.MIT.EDU>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Tested on hardy, lucid, natty, and precise.
This needs to be in place for the upgrade. Anyone have any concerns about
this change? I'm happy to fix the conditional so that we only use
apt-get on Precise+ if people would prefer.
On Tue, 14 Aug 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-08-14 18:09:22 -0400 (Tue, 14 Aug 2012)
> New Revision: 25722
>
> Modified:
> trunk/debathena/scripts/installer/install-debathena.beta.sh
> Log:
> Of course Hardy is still too incompetent, so conditionalize on which package manager to use
>
> Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
> ===================================================================
> --- trunk/debathena/scripts/installer/install-debathena.beta.sh 2012-08-14 21:59:59 UTC (rev 25721)
> +++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2012-08-14 22:09:22 UTC (rev 25722)
> @@ -67,14 +67,20 @@
> fi
> fi
> distro=`lsb_release -cs`
> +aptitude=aptitude
> case $distro in
> squeeze)
> ;;
> - hardy|lucid|natty|oneiric|precise)
> + hardy|lucid)
> ubuntu=yes
> ;;
> + natty|oneiric|precise)
> + ubuntu=yes
> + aptitude=apt-get
> + ;;
> quantal)
> ubuntu=yes
> + aptitude=apt-get
> output "The release you are running ($distro) is not supported"
> output "and installing Debathena on it is probably a bad idea."
> if ! test -f /root/pxe-install-flag; then
> @@ -374,7 +380,7 @@
> apt-key add debathena-archive-keyring.asc
> rm ./debathena-archive-keyring.asc
>
> -apt-get update
> +$aptitude update
>
> if [ -z "$modules" ]; then
> modules_want=$(dpkg-query -W -f '${Source}\t${Package}\n' 'linux-image-*' | \
> @@ -407,17 +413,17 @@
> # debathena packages will later stomp on anyway.
> output "Installing main Debathena metapackage $mainpackage"
>
> -apt-get -y install "$mainpackage"
> +$aptitude -y install "$mainpackage"
>
> # Use the default front end and allow questions to be asked; otherwise
> # Java will fail to install since it has to present its license.
> if [ yes = "$csoft" ]; then
> output "Installing debathena-extra-software"
> - DEBIAN_PRIORITY=critical apt-get -y install debathena-extra-software
> + DEBIAN_PRIORITY=critical $aptitude -y install debathena-extra-software
> fi
> if [ yes = "$tsoft" ]; then
> output "Installing debathena-thirdparty"
> - DEBIAN_PRIORITY=critical apt-get -y install debathena-thirdparty
> + DEBIAN_PRIORITY=critical $aptitude -y install debathena-thirdparty
> fi
>
> # Post-install cleanup for cluster systems.
>
>
