Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.functions.sh.in

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

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

    revision 1684 by niro, Mon Feb 6 10:22:30 2012 UTC revision 2158 by niro, Wed Aug 14 07:46:36 2013 UTC
    # Line 343  munpack() Line 343  munpack()
    343   DEST=$2   DEST=$2
    344   fi   fi
    345    
    346     echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
    347    
    348   [[ ! -d ${DEST} ]] && install -d ${DEST}   [[ ! -d ${DEST} ]] && install -d ${DEST}
    349    
    350   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
    # Line 392  munpack() Line 394  munpack()
    394   tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."   tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
    395   ;;   ;;
    396   rar)   rar)
    397   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST} || die ".rar unpack failed."
    398   ;;   ;;
    399   zip|xpi|jar)   zip|xpi|jar)
    400   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
    # Line 571  sminclude() Line 573  sminclude()
    573   fi   fi
    574  }  }
    575    
    576    march()
    577    {
    578     local retval
    579    
    580     if [[ ! -z ${ARCH} ]]
    581     then
    582     echo "${ARCH}"
    583     retval=0
    584     else
    585     retval=1
    586     fi
    587    
    588     return "${retval}"
    589    }
    590    
    591    marchsrcfile()
    592    {
    593     local retval
    594     local var="$1"
    595    
    596     [[ -z ${var} ]] && var="SRCFILE"
    597    
    598     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    599     then
    600     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
    601     retval=0
    602     else
    603     retval=1
    604     fi
    605    
    606     return "${retval}"
    607    }
    608    
    609    marchsrcdir()
    610    {
    611     local retval
    612     if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
    613     then
    614     eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
    615     retval=0
    616     else
    617     retval=1
    618     fi
    619    
    620     return "${retval}"
    621    }
    622    
    623    marchdepend()
    624    {
    625     local retval
    626    
    627     if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
    628     then
    629     echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    630     retval=0
    631     else
    632     retval=1
    633     fi
    634    
    635     return "${retval}"
    636    }
    637    
    638    marchsdepend()
    639    {
    640     local retval
    641     if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
    642     then
    643     echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    644     retval=0
    645     else
    646     retval=1
    647     fi
    648    
    649     return "${retval}"
    650    }
    651    
    652  setup_distcc_environment()  setup_distcc_environment()
    653  {  {
    654   if [ -x /usr/bin/distcc ]   if [ -x /usr/bin/distcc ]
    # Line 604  fix_mage_deps() Line 682  fix_mage_deps()
    682   local NDEPEND   local NDEPEND
    683   local sym dep cat pver pname   local sym dep cat pver pname
    684    
    685     # first of all remove all tabs and duplicate lines
    686     if [ -n "${depend}" ]
    687     then
    688     depend=$(echo "${depend}" | sed 's:\t::g' | sort -u)
    689     fi
    690    
    691   # deps and provides are special   # deps and provides are special
    692   # they must be fixed to match the target   # they must be fixed to match the target
    693    
    # Line 875  split_save_variables() Line 959  split_save_variables()
    959   export SAVED_DESCRIPTION="${DESCRIPTION}"   export SAVED_DESCRIPTION="${DESCRIPTION}"
    960   export SAVED_HOMEPAGE="${HOMEPAGE}"   export SAVED_HOMEPAGE="${HOMEPAGE}"
    961   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
    962     export SAVED_SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS}"
    963   export SAVED_STATE="${STATE}"   export SAVED_STATE="${STATE}"
      export SAVED_PKGTYPE="${PKGTYPE}"  
    964   export SAVED_INHERITS="${INHERITS}"   export SAVED_INHERITS="${INHERITS}"
    965   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
    966   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
    # Line 950  split_restore_variables() Line 1034  split_restore_variables()
    1034   export DESCRIPTION="${SAVED_DESCRIPTION}"   export DESCRIPTION="${SAVED_DESCRIPTION}"
    1035   export HOMEPAGE="${SAVED_HOMEPAGE}"   export HOMEPAGE="${SAVED_HOMEPAGE}"
    1036   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
    1037     export SPECIAL_VARS="${SAVED_SPECIAL_FUNCTIONS}"
    1038   export STATE="${SAVED_STATE}"   export STATE="${SAVED_STATE}"
      export PKGTYPE="${SAVED_PKGTYPE}"  
    1039   export INHERITS="${SAVED_INHERITS}"   export INHERITS="${SAVED_INHERITS}"
    1040   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
    1041   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
    # Line 1019  split_unset_variables() Line 1103  split_unset_variables()
    1103   unset SAVED_DESCRIPTION   unset SAVED_DESCRIPTION
    1104   unset SAVED_HOMEPAGE   unset SAVED_HOMEPAGE
    1105   unset SAVED_SPECIAL_VARS   unset SAVED_SPECIAL_VARS
    1106     unset SAVED_SPECIAL_FUNCTIONS
    1107   unset SAVED_STATE   unset SAVED_STATE
    1108   unset SAVED_PKGTYPE   unset SAVED_PKGTYPE
    1109   unset SAVED_INHERITS   unset SAVED_INHERITS
    # Line 1216  run_resume() Line 1301  run_resume()
    1301   return 1   return 1
    1302   fi   fi
    1303  }  }
    1304    
    1305    mqalint()
    1306    {
    1307     return 0
    1308    }
    Legend:
    Removed from v.1684  
    changed lines
      Added in v.2158