Magellan Linux

Diff of /trunk/mage/usr/lib/mage/meta-generator.sh

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

revision 2294 by niro, Fri Dec 6 09:46:05 2013 UTC revision 2295 by niro, Fri Dec 6 09:48:51 2013 UTC
# Line 95  SMAGEFILE="$1" Line 95  SMAGEFILE="$1"
95  [ -z ${SMAGEFILE} ] && die "No smage file given."  [ -z ${SMAGEFILE} ] && die "No smage file given."
96  [ -e ${SMAGEFILE} ] || die "Smage file '${SMAGEFILE}' does not exist."  [ -e ${SMAGEFILE} ] || die "Smage file '${SMAGEFILE}' does not exist."
97    
 PKGNAME="${PNAME}-${PVER}-${PBUILD}"  
 ARCHPKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"  
   
98  if [[ -n ${PKGTARBALL} ]]  if [[ -n ${PKGTARBALL} ]]
99  then  then
100   # abort if given file is not a pkg   # abort if given file is not a pkg
# Line 118  fi Line 115  fi
115  # get generic package information from smage file  # get generic package information from smage file
116  smagesource ${SMAGEFILE}  smagesource ${SMAGEFILE}
117    
118    PKGNAME="${PNAME}-${PVER}-${PBUILD}"
119    ARCHPKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"
120    
121  # set the right meta-location  # set the right meta-location
122  [[ ! -d ${METADIR} ]] && install -d ${METADIR}  [[ ! -d ${METADIR} ]] && install -d ${METADIR}
123  METAFILE="${METADIR}/${ARCHPKGNAME}.${METASUFFIX}"  METAFILE="${METADIR}/${ARCHPKGNAME}.${METASUFFIX}"

Legend:
Removed from v.2294  
changed lines
  Added in v.2295