[24414] in Source-Commits
/svn/athena r24009 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri Sep 18 16:32:08 2009
Date: Fri, 18 Sep 2009 16:22:49 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200909182022.n8IKMn9h009263@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-09-18 16:22:49 -0400 (Fri, 18 Sep 2009)
New Revision: 24009
Modified:
trunk/debathena/scripts/installer/install-debathena.sh
Log:
Two user-friendliness tweaks to the installer.
- If you have ubuntu-desktop installed, suggest using sudo to become
root.
- Don't prompt about debathena-build-depends; it's a strange question
for normals, and devs are assumed to be able to know how to install
this package on their own.
Modified: trunk/debathena/scripts/installer/install-debathena.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.sh 2009-09-18 14:01:58 UTC (rev 24008)
+++ trunk/debathena/scripts/installer/install-debathena.sh 2009-09-18 20:22:49 UTC (rev 24009)
@@ -36,6 +36,9 @@
if [ `id -u` != "0" ]; then
error "You must run the Debathena installer as root."
+ if dpkg -l ubuntu-desktop >/dev/null 2>&1; then
+ error "Try running 'sudo $0'."
+ fi
exit 1
fi
@@ -71,15 +74,6 @@
done
mainpackage=debathena-$category
-dev=no
-echo
-if [ cluster != $category ] ; then
- ask "Will this machine be used to build Debathena packages [y/N]? " n
- if [ y = "$answer" ]; then
- dev=yes
- fi
-fi
-
csoft=no
tsoft=no
echo "The extra-software package installs a standard set of software"
@@ -108,7 +102,6 @@
echo "A summary of your choices:"
echo " Category: $category"
-echo " Debian development package: $dev"
echo " Extra-software package: $csoft"
echo " Third-party software package: $tsoft"
echo ""
@@ -263,13 +256,6 @@
DEBIAN_FRONTEND=noninteractive aptitude -y install "$mainpackage"
-# This package is relatively small so it's not as important, but allow
-# critical questions to be asked.
-if [ yes = "$dev" ]; then
- output "Installing debathena-build-depends"
- DEBIAN_PRIORITY=critical aptitude -y install debathena-build-depends
-fi
-
# 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
