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 944 by niro, Fri Nov 20 22:39:11 2009 UTC revision 945 by niro, Sat Nov 21 01:31:33 2009 UTC
    # Line 898  split_save_variables() Line 898  split_save_variables()
    898   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
    899   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
    900   export SAVED_PROVIDE="${PROVIDE}"   export SAVED_PROVIDE="${PROVIDE}"
    901     export SAVED_NOPKGBUILD="${NOPKGBUILD}"
    902    
    903     # bindir too
    904     export SAVED_BINDIR="${BINDIR}"
    905    
    906     # export the SPLIT_PACKAGE_BASE
    907     export SPLIT_PACKAGE_BASE="${SAVED_PNAME}"
    908    
    909   # functions   # functions
    910   if [[ ! -z $(typeset -f preinstall) ]]   if [[ ! -z $(typeset -f preinstall) ]]
    # Line 952  split_restore_variables() Line 959  split_restore_variables()
    959   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
    960   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
    961   export PROVIDE="${SAVED_PROVIDE}"   export PROVIDE="${SAVED_PROVIDE}"
    962     export NOPKGBUILD="${SAVED_NOPKGBUILD}"
    963    
    964     # bindir too
    965     export BINDIR="${SAVED_BINDIR}"
    966    
    967   # functions   # functions
    968   if [[ ! -z $(typeset -f SAVED_preinstall) ]]   if [[ ! -z $(typeset -f SAVED_preinstall) ]]
    # Line 1004  split_restore_variables() Line 1015  split_restore_variables()
    1015   unset SAVED_DEPEND   unset SAVED_DEPEND
    1016   unset SAVED_SDEPEND   unset SAVED_SDEPEND
    1017   unset SAVED_PROVIDE   unset SAVED_PROVIDE
    1018     unset SAVED_BINDIR
    1019     unset SAVED_NOPKGBUILD
    1020     unset SPLIT_PACKAGE_BASE
    1021   unset -f SAVED_preinstall   unset -f SAVED_preinstall
    1022   unset -f SAVED_postinstall   unset -f SAVED_postinstall
    1023   unset -f SAVED_preremove   unset -f SAVED_preremove
    # Line 1133  step_by_step() Line 1147  step_by_step()
    1147  {  {
    1148   if [[ ${STEP_BY_STEP} = true ]]   if [[ ${STEP_BY_STEP} = true ]]
    1149   then   then
    1150   echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"   echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
    1151   echo "Press [enter] to continue"   echo "Press [enter] to continue"
    1152   read   read
    1153   fi   fi
    # Line 1456  step_by_step $_ Line 1470  step_by_step $_
    1470  # build several subpackages  # build several subpackages
    1471  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
    1472  then  then
    1473   # save bindir   # save bindir & pname
    1474     split_save_variables
    1475   export SAVED_BINDIR="${BINDIR}"   export SAVED_BINDIR="${BINDIR}"
    1476   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1477   do   do
    # Line 1464  then Line 1479  then
    1479   then   then
    1480   # export subpackage bindir   # export subpackage bindir
    1481   export BINDIR="${SAVED_BINDIR}_${subpackage}"   export BINDIR="${SAVED_BINDIR}_${subpackage}"
    1482     # export PNAME, several internal function and include
    1483     # rely on this variable
    1484     export PNAME="${subpackage}"
    1485    
    1486     echo
    1487     echo -en "${COLBLUE}*** ${COLDEFAULT}"
    1488     echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
    1489     echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    1490     echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    1491    
    1492   src_install_${subpackage} | ${SMAGE_LOG_CMD}   src_install_${subpackage} | ${SMAGE_LOG_CMD}
    1493   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    1494   step_by_step $_   step_by_step $_
    1495   fi   fi
    1496   done   done
    1497   # restore bindir   # restore bindir & pname
    1498   export BINDIR="${SAVED_BINDIR}"   split_restore_variables
      unset SAVED_BINDIR  
    1499  else  else
    1500   src_install | ${SMAGE_LOG_CMD}   src_install | ${SMAGE_LOG_CMD}
    1501   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    1502   step_by_step $_   step_by_step $_
    1503  fi  fi
    1504    
     echo -e "${COLGREEN}DEB${COLRED}UG!${COLDEFAULT}"  
       
    1505  # compressing doc, info & man files  # compressing doc, info & man files
    1506  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
    1507  then  then
    Legend:
    Removed from v.944  
    changed lines
      Added in v.945