Magellan Linux

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

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

revision 1347 by niro, Sat Jun 4 09:25:44 2011 UTC revision 1436 by niro, Mon Jul 25 11:59:49 2011 UTC
# Line 71  smagesource() Line 71  smagesource()
71   source ${file}   source ${file}
72    
73   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && mystate="${STATE}"
74    
75     # do not overide if local state was broken or disabled!
76     case ${STATE} in
77     broken) return ;;
78     disabled) return ;;
79     esac
80    
81   if [ -f ${SMAGESCRIPTSDIR}/distribution ]   if [ -f ${SMAGESCRIPTSDIR}/distribution ]
82   then   then
83   source ${SMAGESCRIPTSDIR}/distribution   source ${SMAGESCRIPTSDIR}/distribution
# Line 462  munpack() Line 469  munpack()
469   popd > /dev/null   popd > /dev/null
470   fi   fi
471   ;;   ;;
472     xz)
473     IFTAR="$(basename $SRCFILE .xz)"
474     IFTAR="${IFTAR##*.}"
475     if [[ ${IFTAR} = tar ]]
476     then
477     tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.xz unpack failed."
478     else
479     pushd ${DEST} > /dev/null
480     xzcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .xz) || die ".xz unpack failed."
481     popd > /dev/null
482     fi
483     ;;
484   tbz2|mpks|mpk)   tbz2|mpks|mpk)
485   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."
486   ;;   ;;
487   tgz)   tgz)
488   tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tgz unpack failed."   tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tgz unpack failed."
489   ;;   ;;
490     txz|mpkzs|mpkz)
491     tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
492     ;;
493   rar)   rar)
494   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
495   ;;   ;;
# Line 521  mpatch() Line 543  mpatch()
543  mlibtoolize()  mlibtoolize()
544  {  {
545   local opts="$@"   local opts="$@"
546   [[ -z ${opts} ]] && opts="--copy --force"   [[ -z ${opts} ]] && opts="--verbose --install --force"
547    
548   libtoolize ${opts} || die "running: mlibtoolize ${opts}"   libtoolize ${opts} || die "running: mlibtoolize ${opts}"
549  }  }
# Line 781  build_mage_script() Line 803  build_mage_script()
803   do   do
804   echo -n " ${i}"  >> ${dest}   echo -n " ${i}"  >> ${dest}
805   done   done
806     # a CRLF is needed here!
807     echo >> ${dest}
808   fi   fi
809    
810   # deps and provides   # deps and provides
# Line 810  build_mage_script() Line 834  build_mage_script()
834    
835  regen_mage_tree()  regen_mage_tree()
836  {  {
837   local i   local subpackage
838    
839   # build them only if requested   # build them only if requested
840   if [[ ${REGEN_MAGE_TREE} = true ]]   if [[ ${REGEN_MAGE_TREE} = true ]]
# Line 821  regen_mage_tree() Line 845  regen_mage_tree()
845   # build for each target a mage file   # build for each target a mage file
846   # run it with several targets   # run it with several targets
847   echo   echo
848   for i in ${MAGE_TARGETS}   for subpackage in ${MAGE_TARGETS}
849   do   do
850   build_mage_script --target "${i}"   build_mage_script --target "${subpackage}"
851   done   done
852   echo   echo
853    
# Line 836  regen_mage_tree() Line 860  regen_mage_tree()
860   # build for each subpackage a mage file   # build for each subpackage a mage file
861   # run it with several targets   # run it with several targets
862   echo   echo
863   for i in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
864   do   do
865   # get the right variables for the split   # get the right variables for the split
866   export PNAME="${i}"   export PNAME="${subpackage}"
867   split_info_${i}   split_info_${subpackage}
868     # get the preinstall etc
869     split_export_inherits ${subpackage}
870   build_mage_script --split-pkg-base "${split_pkg_base}"   build_mage_script --split-pkg-base "${split_pkg_base}"
871     # delete split preinstall etc
872     split_delete_inherits ${subpackage}
873   # restore smage environment   # restore smage environment
874   split_restore_variables   split_restore_variables
875   done   done
# Line 1027  split_unset_variables() Line 1055  split_unset_variables()
1055   unset -f SAVED_postremove   unset -f SAVED_postremove
1056  }  }
1057    
1058    split_export_inherits()
1059    {
1060     local subpackage="$1"
1061     local func
1062     local newfunc
1063    
1064     for func in preinstall postinstall preremove postremove
1065     do
1066     if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
1067     then
1068     newfunc=$(typeset -f ${func}_${subpackage})
1069     newfunc="${newfunc/_${subpackage} (/ (}"
1070     eval "${newfunc}"
1071     fi
1072     done
1073    }
1074    
1075    split_delete_inherits()
1076    {
1077     local subpackage="$1"
1078     local func
1079    
1080     for func in preinstall postinstall preremove postremove
1081     do
1082     if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
1083     then
1084     unset -f ${func}
1085     fi
1086     done
1087     }
1088    
1089  export_inherits()  export_inherits()
1090  {  {
1091   local include="$1"   local include="$1"

Legend:
Removed from v.1347  
changed lines
  Added in v.1436