Magellan Linux

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 1207 by niro, Fri Jan 28 20:34:38 2011 UTC
# Line 198  download_sources() Line 198  download_sources()
198   then   then
199   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
200   wget \   wget \
201   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
202   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
203   "${my_SRC_URI_MIRROR}"   "${my_SRC_URI_MIRROR}"
204   if [[ $? = 0 ]]   if [[ $? = 0 ]]
# Line 222  download_sources() Line 219  download_sources()
219   then   then
220   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
221   wget \   wget \
222   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
223   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
224   "${my_SRC_URI_MIRROR}"   "${my_SRC_URI_MIRROR}"
225   if [[ $? = 0 ]]   if [[ $? = 0 ]]
# Line 246  download_sources() Line 240  download_sources()
240   then   then
241   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
242   wget \   wget \
243   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
244   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
245   "${my_SRC_URI_MIRROR}"   "${my_SRC_URI_MIRROR}"
246   if [[ $? = 0 ]]   if [[ $? = 0 ]]
# Line 270  download_sources() Line 261  download_sources()
261   then   then
262   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
263   wget \   wget \
264   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
265   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
266   "${my_SRC_URI_MIRROR}"   "${my_SRC_URI_MIRROR}"
267   if [[ $? = 0 ]]   if [[ $? = 0 ]]
# Line 294  download_sources() Line 282  download_sources()
282   then   then
283   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
284   wget \   wget \
285   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
286   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
287   "${my_SRC_URI_MIRROR}"   "${my_SRC_URI_MIRROR}"
288   if [[ $? = 0 ]]   if [[ $? = 0 ]]
# Line 313  download_sources() Line 298  download_sources()
298   then   then
299   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
300   wget \   wget \
301   --passive-ftp \   ${WGET_FETCH_OPTIONS} \
  --tries 3 \  
  --continue \  
  --progress bar \  
302   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \
303   "${my_SRC_URI}"   "${my_SRC_URI}"
304   fi   fi
# Line 530  minstalldocs() Line 512  minstalldocs()
512   install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."   install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
513   fi   fi
514    
515     local i
516   for i in ${docfiles}   for i in ${docfiles}
517   do   do
518   cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."   if [ -f ${i} ]
519   install -m 0644 ${SRCDIR}/${i}.gz \   then
520   ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."   cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
521     install -m 0644 ${SRCDIR}/${i}.gz \
522     ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
523     fi
524   done   done
525  }  }
526    
# Line 844  regen_mage_tree() Line 830  regen_mage_tree()
830   export PNAME="${i}"   export PNAME="${i}"
831   split_info_${i}   split_info_${i}
832   build_mage_script --split-pkg-base "${split_pkg_base}"   build_mage_script --split-pkg-base "${split_pkg_base}"
833     # restore smage environment
834     split_restore_variables
835   done   done
836   echo   echo
837   # restore smage environment   # unset all saved smage variables
838   split_restore_variables   split_unset_variables
839    
840   else   else
841   echo   echo
# Line 898  split_save_variables() Line 886  split_save_variables()
886   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
887   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
888   export SAVED_PROVIDE="${PROVIDE}"   export SAVED_PROVIDE="${PROVIDE}"
889     export SAVED_NOPKGBUILD="${NOPKGBUILD}"
890    
891     # bindir too
892     export SAVED_BINDIR="${BINDIR}"
893    
894     # export the SPLIT_PACKAGE_BASE
895     export SPLIT_PACKAGE_BASE="${SAVED_PNAME}"
896    
897   # functions   # functions
898   if [[ ! -z $(typeset -f preinstall) ]]   if [[ ! -z $(typeset -f preinstall) ]]
# Line 952  split_restore_variables() Line 947  split_restore_variables()
947   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
948   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
949   export PROVIDE="${SAVED_PROVIDE}"   export PROVIDE="${SAVED_PROVIDE}"
950     export NOPKGBUILD="${SAVED_NOPKGBUILD}"
951    
952     # bindir too
953     export BINDIR="${SAVED_BINDIR}"
954    
955   # functions   # functions
956   if [[ ! -z $(typeset -f SAVED_preinstall) ]]   if [[ ! -z $(typeset -f SAVED_preinstall) ]]
# Line 989  split_restore_variables() Line 988  split_restore_variables()
988   eval "${saved_postremove/SAVED_/}"   eval "${saved_postremove/SAVED_/}"
989   export -f postremove   export -f postremove
990   fi   fi
991    }
992    
993    split_unset_variables()
994    {
995   # unset saved vars; not needed anymore   # unset saved vars; not needed anymore
996   unset SAVED_PNAME   unset SAVED_PNAME
997   unset SAVED_PVER   unset SAVED_PVER
# Line 1004  split_restore_variables() Line 1006  split_restore_variables()
1006   unset SAVED_DEPEND   unset SAVED_DEPEND
1007   unset SAVED_SDEPEND   unset SAVED_SDEPEND
1008   unset SAVED_PROVIDE   unset SAVED_PROVIDE
1009     unset SAVED_BINDIR
1010     unset SAVED_NOPKGBUILD
1011     unset SPLIT_PACKAGE_BASE
1012   unset -f SAVED_preinstall   unset -f SAVED_preinstall
1013   unset -f SAVED_postinstall   unset -f SAVED_postinstall
1014   unset -f SAVED_preremove   unset -f SAVED_preremove
# Line 1133  step_by_step() Line 1138  step_by_step()
1138  {  {
1139   if [[ ${STEP_BY_STEP} = true ]]   if [[ ${STEP_BY_STEP} = true ]]
1140   then   then
1141   echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"   echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
1142   echo "Press [enter] to continue"   echo "Press [enter] to continue"
1143   read   read
1144   fi   fi
# Line 1165  fi Line 1170  fi
1170  # creates md5sums for smages to given dir  # creates md5sums for smages to given dir
1171  if [[ $1 = calcmd5 ]]  if [[ $1 = calcmd5 ]]
1172  then  then
1173   if [ $# -ge 3 ]   if [ $# -ge 2 ]
1174   then   then
1175   SMAGENAME="$2"   SMAGENAME="$2"
1176   MD5DIR="$3"   MD5DIR="$3"
1177     [[ -z ${MD5DIR} ]] && MD5DIR="$(dirname ${SMAGENAME})/md5"
1178    
1179   source ${SMAGENAME} || die "download source failed"   source ${SMAGENAME} || die "download source failed"
1180    
1181   # overridable sourcedir; must be declared after source of the smage2   # overridable sourcedir; must be declared after source of the smage2
# Line 1221  then Line 1228  then
1228   echo   echo
1229   else   else
1230   echo "Usage: Calculating MD5 Sums:"   echo "Usage: Calculating MD5 Sums:"
1231   echo "    $(basename $0) calcmd5 /path/to/SMAGENAME /path/to/MD5DIR"   echo "    $(basename $0) calcmd5 /path/to/SMAGENAME [/path/to/MD5DIR]"
1232   echo   echo
1233   echo   echo
1234   echo "Export the CALC_SOURCEDIR variable to override current SOURCEDIRs."   echo "Export the CALC_SOURCEDIR variable to override current SOURCEDIRs."
# Line 1278  then Line 1285  then
1285   elif [[ -n ${SPLIT_PACKAGES} ]]   elif [[ -n ${SPLIT_PACKAGES} ]]
1286   then   then
1287   split_save_variables   split_save_variables
1288   for subpackage in ${SPLIT_PACKAGE}   for subpackage in ${SPLIT_PACKAGES}
1289   do   do
1290   # get the right variables for the split   # get the right variables for the split
1291   export PNAME="${subpackage}"   export PNAME="${subpackage}"
# Line 1290  then Line 1297  then
1297   --pver "${PVER}" \   --pver "${PVER}" \
1298   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
1299   --parch "${ARCH}"   --parch "${ARCH}"
1300     # restore smage environment
1301     split_restore_variables
1302   done   done
1303   split_restore_variables   # unset all saved smage variables
1304     split_unset_variables
1305    
1306   else   else
1307   # build md5sum for existing packages   # build md5sum for existing packages
# Line 1456  step_by_step $_ Line 1466  step_by_step $_
1466  # build several subpackages  # build several subpackages
1467  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
1468  then  then
1469   # save bindir   # save bindir & pname
1470     split_save_variables
1471   export SAVED_BINDIR="${BINDIR}"   export SAVED_BINDIR="${BINDIR}"
1472   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
1473   do   do
# Line 1464  then Line 1475  then
1475   then   then
1476   # export subpackage bindir   # export subpackage bindir
1477   export BINDIR="${SAVED_BINDIR}_${subpackage}"   export BINDIR="${SAVED_BINDIR}_${subpackage}"
1478     # export PNAME, several internal function and include
1479     # rely on this variable
1480     export PNAME="${subpackage}"
1481    
1482     echo
1483     echo -en "${COLBLUE}*** ${COLDEFAULT}"
1484     echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
1485     echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
1486     echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
1487    
1488   src_install_${subpackage} | ${SMAGE_LOG_CMD}   src_install_${subpackage} | ${SMAGE_LOG_CMD}
1489   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
1490   step_by_step $_   step_by_step $_
1491   fi   fi
1492   done   done
1493   # restore bindir   # restore bindir & pname
1494   export BINDIR="${SAVED_BINDIR}"   split_restore_variables
1495   unset SAVED_BINDIR   # unset all saved smage variables
1496     split_unset_variables
1497  else  else
1498   src_install | ${SMAGE_LOG_CMD}   src_install | ${SMAGE_LOG_CMD}
1499   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
1500   step_by_step $_   step_by_step $_
1501  fi  fi
1502    
 echo -e "${COLGREEN}DEB${COLRED}UG!${COLDEFAULT}"  
   
1503  # compressing doc, info & man files  # compressing doc, info & man files
1504  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
1505  then  then
1506   for subpackage in ${SPLIT_PACKAGE}   for subpackage in ${SPLIT_PACKAGES}
1507   do   do
1508   mcompressdocs ${BINDIR}_${subpackage}   mcompressdocs ${BINDIR}_${subpackage}
1509   done   done
# Line 1500  case ${NOSTRIP} in Line 1520  case ${NOSTRIP} in
1520   *)   *)
1521   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
1522   then   then
1523   for subpackage in ${SPLIT_PACKAGE}   for subpackage in ${SPLIT_PACKAGES}
1524   do   do
1525   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
1526   mstripbins ${BINDIR}_${subpackage}   mstripbins ${BINDIR}_${subpackage}
1527   echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
1528   mstriplibs ${BINDIR}_${subpackage}   mstriplibs ${BINDIR}_${subpackage}
1529   done   done
1530   else   else
# Line 1560  case ${NOPKGBUILD} in Line 1580  case ${NOPKGBUILD} in
1580   export PNAME="${subpackage}"   export PNAME="${subpackage}"
1581   split_info_${PNAME}   split_info_${PNAME}
1582    
1583     # jump to next one if NOPKGBUILD is set in split_info
1584     case ${NOPKGBUILD} in
1585     true|TRUE|yes|y) continue ;;
1586     esac
1587    
1588   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
1589   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
1590   then   then
# Line 1580  case ${NOPKGBUILD} in Line 1605  case ${NOPKGBUILD} in
1605   --parch "${ARCH}"   --parch "${ARCH}"
1606    
1607   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
1608    
1609     # restore smage environment
1610     split_restore_variables
1611   done   done
1612   split_restore_variables   # unset all saved smage variables
1613     split_unset_variables
1614    
1615   else   else
1616   ${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.1207