Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

    Diff of /trunk/mage/usr/lib/mage/smage2.sh

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

    revision 943 by niro, Fri Nov 20 22:39:11 2009 UTC revision 951 by niro, Sat Nov 21 14:31:50 2009 UTC
    # Line 844  regen_mage_tree() Line 844  regen_mage_tree()
    844   export PNAME="${i}"   export PNAME="${i}"
    845   split_info_${i}   split_info_${i}
    846   build_mage_script --split-pkg-base "${split_pkg_base}"   build_mage_script --split-pkg-base "${split_pkg_base}"
    847     # restore smage environment
    848     split_restore_variables
    849   done   done
    850   echo   echo
    851   # restore smage environment   # unset all saved smage variables
    852   split_restore_variables   split_unset_variables
    853    
    854   else   else
    855   echo   echo
    # Line 898  split_save_variables() Line 900  split_save_variables()
    900   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
    901   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
    902   export SAVED_PROVIDE="${PROVIDE}"   export SAVED_PROVIDE="${PROVIDE}"
    903     export SAVED_NOPKGBUILD="${NOPKGBUILD}"
    904    
    905     # bindir too
    906     export SAVED_BINDIR="${BINDIR}"
    907    
    908     # export the SPLIT_PACKAGE_BASE
    909     export SPLIT_PACKAGE_BASE="${SAVED_PNAME}"
    910    
    911   # functions   # functions
    912   if [[ ! -z $(typeset -f preinstall) ]]   if [[ ! -z $(typeset -f preinstall) ]]
    # Line 952  split_restore_variables() Line 961  split_restore_variables()
    961   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
    962   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
    963   export PROVIDE="${SAVED_PROVIDE}"   export PROVIDE="${SAVED_PROVIDE}"
    964     export NOPKGBUILD="${SAVED_NOPKGBUILD}"
    965    
    966     # bindir too
    967     export BINDIR="${SAVED_BINDIR}"
    968    
    969   # functions   # functions
    970   if [[ ! -z $(typeset -f SAVED_preinstall) ]]   if [[ ! -z $(typeset -f SAVED_preinstall) ]]
    # Line 989  split_restore_variables() Line 1002  split_restore_variables()
    1002   eval "${saved_postremove/SAVED_/}"   eval "${saved_postremove/SAVED_/}"
    1003   export -f postremove   export -f postremove
    1004   fi   fi
    1005    }
    1006    
    1007    split_unset_variables()
    1008    {
    1009   # unset saved vars; not needed anymore   # unset saved vars; not needed anymore
    1010   unset SAVED_PNAME   unset SAVED_PNAME
    1011   unset SAVED_PVER   unset SAVED_PVER
    # Line 1004  split_restore_variables() Line 1020  split_restore_variables()
    1020   unset SAVED_DEPEND   unset SAVED_DEPEND
    1021   unset SAVED_SDEPEND   unset SAVED_SDEPEND
    1022   unset SAVED_PROVIDE   unset SAVED_PROVIDE
    1023     unset SAVED_BINDIR
    1024     unset SAVED_NOPKGBUILD
    1025     unset SPLIT_PACKAGE_BASE
    1026   unset -f SAVED_preinstall   unset -f SAVED_preinstall
    1027   unset -f SAVED_postinstall   unset -f SAVED_postinstall
    1028   unset -f SAVED_preremove   unset -f SAVED_preremove
    # Line 1133  step_by_step() Line 1152  step_by_step()
    1152  {  {
    1153   if [[ ${STEP_BY_STEP} = true ]]   if [[ ${STEP_BY_STEP} = true ]]
    1154   then   then
    1155   echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"   echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
    1156   echo "Press [enter] to continue"   echo "Press [enter] to continue"
    1157   read   read
    1158   fi   fi
    # Line 1290  then Line 1309  then
    1309   --pver "${PVER}" \   --pver "${PVER}" \
    1310   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1311   --parch "${ARCH}"   --parch "${ARCH}"
    1312     # restore smage environment
    1313     split_restore_variables
    1314   done   done
    1315   split_restore_variables   # unset all saved smage variables
    1316     split_unset_variables
    1317    
    1318   else   else
    1319   # build md5sum for existing packages   # build md5sum for existing packages
    # Line 1456  step_by_step $_ Line 1478  step_by_step $_
    1478  # build several subpackages  # build several subpackages
    1479  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
    1480  then  then
    1481   # save bindir   # save bindir & pname
    1482     split_save_variables
    1483   export SAVED_BINDIR="${BINDIR}"   export SAVED_BINDIR="${BINDIR}"
    1484   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1485   do   do
    # Line 1464  then Line 1487  then
    1487   then   then
    1488   # export subpackage bindir   # export subpackage bindir
    1489   export BINDIR="${SAVED_BINDIR}_${subpackage}"   export BINDIR="${SAVED_BINDIR}_${subpackage}"
    1490     # export PNAME, several internal function and include
    1491     # rely on this variable
    1492     export PNAME="${subpackage}"
    1493    
    1494     echo
    1495     echo -en "${COLBLUE}*** ${COLDEFAULT}"
    1496     echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
    1497     echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    1498     echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    1499    
    1500   src_install_${subpackage} | ${SMAGE_LOG_CMD}   src_install_${subpackage} | ${SMAGE_LOG_CMD}
    1501   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    1502   step_by_step $_   step_by_step $_
    1503   fi   fi
    1504   done   done
    1505   # restore bindir   # restore bindir & pname
    1506   export BINDIR="${SAVED_BINDIR}"   split_restore_variables
    1507   unset SAVED_BINDIR   # unset all saved smage variables
    1508     split_unset_variables
    1509  else  else
    1510   src_install | ${SMAGE_LOG_CMD}   src_install | ${SMAGE_LOG_CMD}
    1511   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    1512   step_by_step $_   step_by_step $_
    1513  fi  fi
    1514    
     echo -e "${COLGREEN}DEB${COLRED}UG!${COLDEFAULT}"  
       
    1515  # compressing doc, info & man files  # compressing doc, info & man files
    1516  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
    1517  then  then
    # Line 1560  case ${NOPKGBUILD} in Line 1592  case ${NOPKGBUILD} in
    1592   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    1593   split_info_${PNAME}   split_info_${PNAME}
    1594    
    1595     # jump to next one if NOPKGBUILD is set in split_info
    1596     case ${NOPKGBUILD} in
    1597     true|TRUE|yes|y) continue ;;
    1598     esac
    1599    
    1600   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
    1601   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
    1602   then   then
    # Line 1580  case ${NOPKGBUILD} in Line 1617  case ${NOPKGBUILD} in
    1617   --parch "${ARCH}"   --parch "${ARCH}"
    1618    
    1619   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1620    
    1621     # restore smage environment
    1622     split_restore_variables
    1623   done   done
    1624   split_restore_variables   # unset all saved smage variables
    1625     split_unset_variables
    1626    
    1627   else   else
    1628   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
    Legend:
    Removed from v.943  
    changed lines
      Added in v.951