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 947 by niro, Sat Nov 21 01:44:27 2009 UTC revision 1085 by niro, Mon Jun 28 18:15:44 2010 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 1000  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 1292  then Line 1283  then
    1283   elif [[ -n ${SPLIT_PACKAGES} ]]   elif [[ -n ${SPLIT_PACKAGES} ]]
    1284   then   then
    1285   split_save_variables   split_save_variables
    1286   for subpackage in ${SPLIT_PACKAGE}   for subpackage in ${SPLIT_PACKAGES}
    1287   do   do
    1288   # get the right variables for the split   # get the right variables for the split
    1289   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    # Line 1304  then Line 1295  then
    1295   --pver "${PVER}" \   --pver "${PVER}" \
    1296   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1297   --parch "${ARCH}"   --parch "${ARCH}"
    1298     # restore smage environment
    1299     split_restore_variables
    1300   done   done
    1301   split_restore_variables   # unset all saved smage variables
    1302     split_unset_variables
    1303    
    1304   else   else
    1305   # build md5sum for existing packages   # build md5sum for existing packages
    # Line 1496  then Line 1490  then
    1490   done   done
    1491   # restore bindir & pname   # restore bindir & pname
    1492   split_restore_variables   split_restore_variables
    1493     # unset all saved smage variables
    1494     split_unset_variables
    1495  else  else
    1496   src_install | ${SMAGE_LOG_CMD}   src_install | ${SMAGE_LOG_CMD}
    1497   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    # Line 1505  fi Line 1501  fi
    1501  # compressing doc, info & man files  # compressing doc, info & man files
    1502  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
    1503  then  then
    1504   for subpackage in ${SPLIT_PACKAGE}   for subpackage in ${SPLIT_PACKAGES}
    1505   do   do
    1506   mcompressdocs ${BINDIR}_${subpackage}   mcompressdocs ${BINDIR}_${subpackage}
    1507   done   done
    # Line 1522  case ${NOSTRIP} in Line 1518  case ${NOSTRIP} in
    1518   *)   *)
    1519   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1520   then   then
    1521   for subpackage in ${SPLIT_PACKAGE}   for subpackage in ${SPLIT_PACKAGES}
    1522   do   do
    1523   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
    1524   mstripbins ${BINDIR}_${subpackage}   mstripbins ${BINDIR}_${subpackage}
    1525   echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
    1526   mstriplibs ${BINDIR}_${subpackage}   mstriplibs ${BINDIR}_${subpackage}
    1527   done   done
    1528   else   else
    # Line 1607  case ${NOPKGBUILD} in Line 1603  case ${NOPKGBUILD} in
    1603   --parch "${ARCH}"   --parch "${ARCH}"
    1604    
    1605   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1606    
    1607     # restore smage environment
    1608     split_restore_variables
    1609   done   done
    1610   split_restore_variables   # unset all saved smage variables
    1611     split_unset_variables
    1612    
    1613   else   else
    1614   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
    Legend:
    Removed from v.947  
    changed lines
      Added in v.1085