Magellan Linux

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

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

revision 1640 by niro, Fri Jan 13 18:29:52 2012 UTC revision 1648 by niro, Fri Jan 13 20:51:18 2012 UTC
# Line 12  smagesource() Line 12  smagesource()
12    
13   source ${file}   source ${file}
14    
15     # if PCAT was not set and PCATEGORIE was found
16     # inform the user and use PCATEGORIE as PCAT
17     if [[ -z ${PCAT} ]]
18     then
19     if [[ -n ${PCATEGORIE} ]]
20     then
21     PCAT="${PCATEGORIE}"
22     # print a warning
23     echo -e "${COLYELLOW}Warning: 'PCATEGORIE' is deprecated and gets removed in the future.${COLDEFAULT}"
24     echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'PCAT' variable.${COLDEFAULT}"
25     echo
26     else
27     die "Neither PCAT nor PCATEGORIE are defined!"
28     fi
29     fi
30    
31   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && mystate="${STATE}"
32    
33   # do not overide if local state was broken or disabled!   # do not overide if local state was broken or disabled!
# Line 606  EOF Line 622  EOF
622  #   PNAME                 name of pkg  #   PNAME                 name of pkg
623  #   PVER                  version  #   PVER                  version
624  #   PBUILD                revision  #   PBUILD                revision
625  #   PCATEGORIE            category of the pkg  #   PCAT                  category of the pkg
626    #   PCATEGORIE            category of the pkg (deprecated, use PCAT!)
627  #   STATE                 state of pkg stable|unstable|old  #   STATE                 state of pkg stable|unstable|old
628  #   DESCRIPTION           a short description (opt)  #   DESCRIPTION           a short description (opt)
629  #   HOMEPAGE              homepage (opt)  #   HOMEPAGE              homepage (opt)
630    #   LICENSE               license information of the pkg (opt)
631  #   DEPEND                runtime dependencies (opt)  #   DEPEND                runtime dependencies (opt)
632  #   SDEPEND               adds needed deps to build the pkg (opt)  #   SDEPEND               adds needed deps to build the pkg (opt)
633  #   PROVIDE               provides a virtual (opt)  #   PROVIDE               provides a virtual (opt)
# Line 649  build_mage_script() Line 667  build_mage_script()
667   magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"   magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"
668    
669   # destination to magefile   # destination to magefile
670   dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"   dest="${MAGE_TREE_DEST}/${PCAT}/${PNAME}${target}/${magefile}"
671    
672   # show what we are doing   # show what we are doing
673   echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"
# Line 667  build_mage_script() Line 685  build_mage_script()
685   echo "DESCRIPTION=\"${DESCRIPTION}\"" >> ${dest}   echo "DESCRIPTION=\"${DESCRIPTION}\"" >> ${dest}
686   echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}   echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
687    
688     # license information
689     echo "LICENSE=\"${LICENSE}\"" >> ${dest}
690    
691   # special tags and vars   # special tags and vars
692   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
693    
# Line 809  split_save_variables() Line 830  split_save_variables()
830   export SAVED_PNAME="${PNAME}"   export SAVED_PNAME="${PNAME}"
831   export SAVED_PVER="${PVER}"   export SAVED_PVER="${PVER}"
832   export SAVED_PBUILD="${PBUILD}"   export SAVED_PBUILD="${PBUILD}"
833   export SAVED_PCATEGORIE="${PCATEGORIE}"   export SAVED_PCAT="${PCAT}"
834   export SAVED_DESCRIPTION="${DESCRIPTION}"   export SAVED_DESCRIPTION="${DESCRIPTION}"
835   export SAVED_HOMEPAGE="${HOMEPAGE}"   export SAVED_HOMEPAGE="${HOMEPAGE}"
836   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
# Line 884  split_restore_variables() Line 905  split_restore_variables()
905   export PNAME="${SAVED_PNAME}"   export PNAME="${SAVED_PNAME}"
906   export PVER="${SAVED_PVER}"   export PVER="${SAVED_PVER}"
907   export PBUILD="${SAVED_PBUILD}"   export PBUILD="${SAVED_PBUILD}"
908   export PCATEGORIE="${SAVED_PCATEGORIE}"   export PCAT="${SAVED_PCAT}"
909   export DESCRIPTION="${SAVED_DESCRIPTION}"   export DESCRIPTION="${SAVED_DESCRIPTION}"
910   export HOMEPAGE="${SAVED_HOMEPAGE}"   export HOMEPAGE="${SAVED_HOMEPAGE}"
911   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
# Line 953  split_unset_variables() Line 974  split_unset_variables()
974   unset SAVED_PNAME   unset SAVED_PNAME
975   unset SAVED_PVER   unset SAVED_PVER
976   unset SAVED_PBUILD   unset SAVED_PBUILD
977   unset SAVED_PCATEGORIE   unset SAVED_PCAT
978   unset SAVED_DESCRIPTION   unset SAVED_DESCRIPTION
979   unset SAVED_HOMEPAGE   unset SAVED_HOMEPAGE
980   unset SAVED_SPECIAL_VARS   unset SAVED_SPECIAL_VARS

Legend:
Removed from v.1640  
changed lines
  Added in v.1648