Magellan Linux

Diff of /branches/mage-next/src/smage2.in

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

trunk/mage/usr/lib/mage/smage2.sh revision 2365 by niro, Mon Jan 6 12:56:50 2014 UTC branches/mage-next/src/smage2.in revision 2615 by niro, Tue Mar 4 15:28:42 2014 UTC
# Line 8  Line 8 
8    
9    
10  # set default user mage.rc  # set default user mage.rc
11  : ${MAGERC="/etc/mage.rc"}  : ${MAGERC="@@SYSCONFDIR@@/mage.rc"}
12    
13  # export default C locale  # export default C locale
14  export LC_ALL=C  export LC_ALL=C
15    
16  source /etc/mage.rc.global  source @@SYSCONFDIR@@/mage.rc.global
17  source ${MAGERC}  source ${MAGERC}
18  source ${MLIBDIR}/mage4.functions.sh  source ${MLIBDIR}/mage4.functions.sh
19  source ${MLIBDIR}/smage2.functions.sh  source ${MLIBDIR}/smage2.functions.sh
# Line 23  export PATH="${PATH}:${MLIBDIR}" Line 23  export PATH="${PATH}:${MLIBDIR}"
23    
24  ## setup ##  ## setup ##
25  SMAGENAME="$1"  SMAGENAME="$1"
 SMAGEVERSION="$(< ${MLIBDIR}/version)"  
26    
27  # expand PKGDIR, BUILDDIR and BINDIR with MROOT  # expand PKGDIR, BUILDDIR and BINDIR with MROOT
28  if [[ -n ${MROOT} ]]  if [[ -n ${MROOT} ]]
# Line 268  SMAGE_LOG_CMD="tee -a /var/log/smage/${P Line 267  SMAGE_LOG_CMD="tee -a /var/log/smage/${P
267  xtitle "Compiling ${PKGNAME}"  xtitle "Compiling ${PKGNAME}"
268  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
269    
 # auto regen mage tree if requested  
 regen_mage_tree  
   
270  if mqueryfeature "srcpkgbuild"  if mqueryfeature "srcpkgbuild"
271  then  then
272   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
# Line 768  else Line 764  else
764   fi   fi
765  fi  fi
766    
767    # auto regen mage tree if requested
768    regen_mage_tree
769    
770  if mqueryfeature "buildlog"  if mqueryfeature "buildlog"
771  then  then
772   bzip2 -9f /var/log/smage/${PKGNAME}.log   bzip2 -9f /var/log/smage/${PKGNAME}.log

Legend:
Removed from v.2365  
changed lines
  Added in v.2615