Magellan Linux

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

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

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

    revision 1648 by niro, Fri Jan 13 20:51:18 2012 UTC revision 1679 by niro, Mon Feb 6 10:04:33 2012 UTC
    # Line 8  smagesource() Line 8  smagesource()
    8  {  {
    9   local file="$1"   local file="$1"
    10   local mystate   local mystate
    11   local mycodename   local mytag
    12    
    13   source ${file}   source ${file}
    14    
    # Line 19  smagesource() Line 19  smagesource()
    19   if [[ -n ${PCATEGORIE} ]]   if [[ -n ${PCATEGORIE} ]]
    20   then   then
    21   PCAT="${PCATEGORIE}"   PCAT="${PCATEGORIE}"
    22     unset PCATEGORIE
    23   # print a warning   # print a warning
    24   echo -e "${COLYELLOW}Warning: 'PCATEGORIE' is deprecated and gets removed in the future.${COLDEFAULT}"   echo -e "${COLYELLOW}Warning: 'PCATEGORIE' is deprecated and gets removed in the future.${COLDEFAULT}"
    25   echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'PCAT' variable.${COLDEFAULT}"   echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'PCAT' variable.${COLDEFAULT}"
    # Line 29  smagesource() Line 30  smagesource()
    30   fi   fi
    31    
    32   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && mystate="${STATE}"
    33     [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
    34    
    35   # do not overide if local state was broken or disabled!   # do not overide if local state was broken or disabled!
    36   case ${STATE} in   case ${STATE} in
    # Line 40  smagesource() Line 42  smagesource()
    42   then   then
    43   source ${SMAGESCRIPTSDIR}/distribution   source ${SMAGESCRIPTSDIR}/distribution
    44   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && mystate="${STATE}"
    45     [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
    46   fi   fi
    47   # now switch state and export it   # now switch state and export it
    48   STATE="${mystate}"   STATE="${mystate}"
    49    
    50     if mqueryfeature "pkgdistrotag"
    51     then
    52     # if DISTROTAG was not defined globally
    53     # or in distribution file then deactivate this feature!
    54     # at this point $mytag must have the distrotag
    55     if [[ -z ${mytag} ]]
    56     then
    57     FVERBOSE=off msetfeature "!pkgdistrotag"
    58     unset DISTROTAG
    59     echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"
    60     echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"
    61     else
    62     # now switch state and export it
    63     export DISTROTAG="${mytag}"
    64     fi
    65     else
    66     unset DISTROTAG
    67     fi
    68    }
    69    
    70    print_distrotag()
    71    {
    72     if FVERBOSE=off mqueryfeature "pkgdistrotag"
    73     then
    74     if [[ ! -z ${DISTROTAG} ]]
    75     then
    76     # add a point as prefix
    77     echo ".${DISTROTAG}"
    78     fi
    79     fi
    80  }  }
    81    
    82  showversion()  showversion()
    # Line 678  build_mage_script() Line 712  build_mage_script()
    712   > ${dest}   > ${dest}
    713    
    714   # pgkname and state   # pgkname and state
    715   echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}   echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}$(print_distrotag)-${PBUILD}\"" >> ${dest}
    716   echo "STATE=\"${STATE}\"" >> ${dest}   echo "STATE=\"${STATE}\"" >> ${dest}
    717    
    718   # description and homepage   # description and homepage
    # Line 779  regen_mage_tree() Line 813  regen_mage_tree()
    813   # get the right variables for the split   # get the right variables for the split
    814   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    815   split_info_${subpackage}   split_info_${subpackage}
    816     # fix PCATEGORIE -> PCAT
    817     if [[ ! -z ${PCATEGORIE} ]]
    818     then
    819     PCAT="${PCATEGORIE}"
    820     unset PCATEGORIE
    821     fi
    822   # get the preinstall etc   # get the preinstall etc
    823   split_export_inherits ${subpackage}   split_export_inherits ${subpackage}
    824   build_mage_script --split-pkg-base "${split_pkg_base}"   build_mage_script --split-pkg-base "${split_pkg_base}"
    # Line 1090  generate_package_md5sum() Line 1130  generate_package_md5sum()
    1130   [ -n "${target}" ] && target="-${target}"   [ -n "${target}" ] && target="-${target}"
    1131    
    1132   # build pkgname   # build pkgname
    1133   pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"   pkgname="${pname}${target}-${pver}-${parch}$(print_distrotag)-${pbuild}"
    1134    
    1135   # build pkg-md5-sum only if requested   # build pkg-md5-sum only if requested
    1136   if mqueryfeature regentree   if mqueryfeature regentree
    # Line 1143  source_pkg_build() Line 1183  source_pkg_build()
    1183   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
    1184   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
    1185    
    1186   echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"   echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}\n"
    1187  }  }
    1188    
    1189  step_by_step()  step_by_step()
    Legend:
    Removed from v.1648  
    changed lines
      Added in v.1679