Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/pkgtools/add2svn-r11.sh

    Diff of /trunk/pkgtools/add2svn-r11.sh

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

    revision 2017 by niro, Thu Jan 3 10:02:24 2013 UTC revision 2117 by niro, Mon May 13 11:49:49 2013 UTC
    # Line 74  PKGNAME=${CURPNAME}-${CURPVER}-${CURARCH Line 74  PKGNAME=${CURPNAME}-${CURPVER}-${CURARCH
    74  SRCPKGNAME=${CURPNAME}-${CURPVER}-${CURPBUILD}.${SRCPKGSUFFIX}  SRCPKGNAME=${CURPNAME}-${CURPVER}-${CURPBUILD}.${SRCPKGSUFFIX}
    75  REPO="$(echo ${SMAGEFILE#*trunk/} | cut -d'/' -f1)"  REPO="$(echo ${SMAGEFILE#*trunk/} | cut -d'/' -f1)"
    76  #REPO="$(echo ${SMAGEFILE#*branches/magellan-next/} | cut -d'/' -f1)"  #REPO="$(echo ${SMAGEFILE#*branches/magellan-next/} | cut -d'/' -f1)"
    77  SSHLOGIN="tjoke@magellan-linux.de:/var/www/htdocs/magellan/magellan-dev/R11/packages"  SSHLOGIN="tjoke@magellan-linux.de:/var/www/htdocs/magellan/R11/packages"
    78  SRCTARBALL_URI="http://magellan-linux.de/magellan/magellan-dev/R11/packages/src"  SRCTARBALL_URI="http://magellan-linux.de/magellan/R11/packages/src"
    79    
    80  die()  die()
    81  {  {
    # Line 119  get_value_from_file() Line 119  get_value_from_file()
    119   source /etc/mage.rc.global   source /etc/mage.rc.global
    120   source /etc/mage.rc   source /etc/mage.rc
    121    
    122     # set the right arch
    123     ARCH="${CURARCH}"
    124    
    125   # evaluate the value   # evaluate the value
    126   source ${file} $> /dev/null   source ${file} $> /dev/null
    127    
    # Line 141  get_function_from_file() Line 144  get_function_from_file()
    144   source /etc/mage.rc.global   source /etc/mage.rc.global
    145   source /etc/mage.rc   source /etc/mage.rc
    146    
    147     # set the right arch
    148     ARCH="${CURARCH}"
    149    
    150   # evaluate the value   # evaluate the value
    151   source ${file} $> /dev/null   source ${file} $> /dev/null
    152   export -f ${function}   export -f ${function}
    # Line 154  else Line 160  else
    160   INSTALLDB_BUILDROOT=$(get_value_from_file INSTALLDB ${BUILDROOT}/etc/mage.rc)   INSTALLDB_BUILDROOT=$(get_value_from_file INSTALLDB ${BUILDROOT}/etc/mage.rc)
    161  fi  fi
    162  CURSPLITPACKAGES="$(get_value_from_file SPLIT_PACKAGES ${SMAGEFILE})"  CURSPLITPACKAGES="$(get_value_from_file SPLIT_PACKAGES ${SMAGEFILE})"
    163    PKGTYPE="$(get_value_from_file PKGTYPE ${SMAGEFILE})"
    164    
    165  # set some proper traps  # set some proper traps
    166  trap "trap_exit" SIGINT SIGTERM  trap "trap_exit" SIGINT SIGTERM
    # Line 179  if [[ -z ${CURSPLITPACKAGES} ]] Line 186  if [[ -z ${CURSPLITPACKAGES} ]]
    186  then  then
    187   if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCAT}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]]   if [[ -d ${BUILDROOT}/${INSTALLDB_BUILDROOT}/${CURPCAT}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]]
    188   then   then
    189   echo "Package '${CURPCAT}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!"   die "Package '${CURPCAT}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in ${BUILDROOT}. Aborting!"
      exit 1  
    190   fi   fi
    191  else  else
    192   for i in ${CURSPLITPACKAGES}   for i in ${CURSPLITPACKAGES}
    # Line 197  else Line 203  else
    203   do   do
    204   echo "     ${i}"   echo "     ${i}"
    205   done   done
    206   echo "Aborted."   die "Aborted."
      exit 1  
    207   fi   fi
    208  fi  fi
    209    
    # Line 259  echo 'else'  >> ${BUILDROOT}/.installrc Line 264  echo 'else'  >> ${BUILDROOT}/.installrc
    264   echo '[[ -f \${SRCTARBALL} ]] && rm \${SRCTARBALL}' >> ${BUILDROOT}/.installrc   echo '[[ -f \${SRCTARBALL} ]] && rm \${SRCTARBALL}' >> ${BUILDROOT}/.installrc
    265   echo 'popd > /dev/null' >> ${BUILDROOT}/.installrc   echo 'popd > /dev/null' >> ${BUILDROOT}/.installrc
    266  echo 'fi' >> ${BUILDROOT}/.installrc  echo 'fi' >> ${BUILDROOT}/.installrc
    267    echo '[ ! -d /BUILDED ] && install -d /BUILDED' >> ${BUILDROOT}/.installrc
    268    echo '[ ! -d /BUILDED/sources ] && install -d /BUILDED/sources' >> ${BUILDROOT}/.installrc
    269  echo 'if [[ ! -z \${CURSPLITPACKAGES} ]]' >> ${BUILDROOT}/.installrc  echo 'if [[ ! -z \${CURSPLITPACKAGES} ]]' >> ${BUILDROOT}/.installrc
    270  echo 'then' >> ${BUILDROOT}/.installrc  echo 'then' >> ${BUILDROOT}/.installrc
    271   echo 'for package in \${CURSPLITPACKAGES}' >> ${BUILDROOT}/.installrc   echo 'for package in \${CURSPLITPACKAGES}' >> ${BUILDROOT}/.installrc
    # Line 274  echo 'mv /var/cache/mage/packages/source Line 281  echo 'mv /var/cache/mage/packages/source
    281  echo 'rm -rf /var/cache/mage/sources/${CURPNAME}' >> ${BUILDROOT}/.installrc  echo 'rm -rf /var/cache/mage/sources/${CURPNAME}' >> ${BUILDROOT}/.installrc
    282  EOF  EOF
    283    
    284  sudo -H /sbin/chroot ${BUILDROOT} /bin/bash /.installrc  sudo -H chroot ${BUILDROOT} /bin/bash /.installrc
    285  sudo rm ${BUILDROOT}/.installrc  sudo rm ${BUILDROOT}/.installrc
    286    
    287  if [[ ! -z ${CURSPLITPACKAGES} ]]  if [[ ! -z ${CURSPLITPACKAGES} ]]
    # Line 305  then Line 312  then
    312   fi   fi
    313   done   done
    314  else  else
    315   if [[ -f ${BUILDROOT}/BUILDED/${PKGNAME} ]]   if [[ ${PKGTYPE} = virtual ]]
    316     then
    317     unset PKGTYPE
    318     echo "Virtual Package: nothing to upload"
    319     elif [[ -f ${BUILDROOT}/BUILDED/${PKGNAME} ]]
    320   then   then
    321   scp ${BUILDROOT}/BUILDED/${PKGNAME} ${SSHLOGIN}/${CURARCH}/   scp ${BUILDROOT}/BUILDED/${PKGNAME} ${SSHLOGIN}/${CURARCH}/
    322   else   else
    Legend:
    Removed from v.2017  
    changed lines
      Added in v.2117