Magellan Linux

Diff of /trunk/mage/usr/lib/mage/mage4.functions.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 370 by niro, Thu Apr 27 11:52:59 2006 UTC revision 385 by niro, Mon Jul 17 20:48:22 2006 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2  # Magellan Linux Installer Functions (mage.functions.sh)  # Magellan Linux Installer Functions (mage.functions.sh)
3  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.18 2006-04-27 11:52:53 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.20 2006-07-17 20:48:22 niro Exp $
4    
5  mage_setup()  mage_setup()
6  {  {
# Line 1763  is_newer_mage_version_available() Line 1763  is_newer_mage_version_available()
1763   echo -en ${COLRED}"An update for your packetmanager is available. "${COLDEFAULT}   echo -en ${COLRED}"An update for your packetmanager is available. "${COLDEFAULT}
1764   echo -e ${COLBLUE}"[ ${newest_mage} ]"${COLDEFAULT}   echo -e ${COLBLUE}"[ ${newest_mage} ]"${COLDEFAULT}
1765   echo "It is recommened to install this newer version"   echo "It is recommened to install this newer version"
1766   echo "or your current system installation may brake."   echo "or your current system installation may break."
1767   echo   echo
1768   echo -en "Please update mage by running "   echo -en "Please update mage by running "
1769   echo -e ${COLGREEN}"'mage install mage'"${COLDEFAULT}   echo -e ${COLGREEN}"'mage install mage'"${COLDEFAULT}
# Line 2170  mage_install() Line 2170  mage_install()
2170   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2   smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
2171   if [ -f "${smage2file}" ]   if [ -f "${smage2file}" ]
2172   then   then
2173     echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
2174   smage2 ${smage2file} || die "compile failed"   smage2 ${smage2file} || die "compile failed"
2175   else   else
2176   echo   echo
# Line 2183  mage_install() Line 2184  mage_install()
2184   if [[ ${PKGTYPE} != virtual ]] && \   if [[ ${PKGTYPE} != virtual ]] && \
2185   [[ ${PKGTYPE} != sources ]]   [[ ${PKGTYPE} != sources ]]
2186   then   then
2187   # show a verbose message on src-install   echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
  if [[ ${src_install} = true ]]  
  then  
  echo -ne "${COLBLUE} *** ${COLDEFAULT}"  
  echo -ne "merging files: "  
  echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"  
  echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"  
  fi  
2188   build_doinstall ${PKGNAME}   build_doinstall ${PKGNAME}
2189   fi   fi
2190    

Legend:
Removed from v.370  
changed lines
  Added in v.385