From bd4976a460cc6af4da09164c6f1d1581480a9771 Mon Sep 17 00:00:00 2001 From: gobo72 Date: Thu, 24 Mar 2011 01:22:29 +0000 Subject: [PATCH] =?utf8?q?Harmonis=C3=A9=20les=20noms=20des=20diff=C3=A9re?= =?utf8?q?ntes=20fonctions=20get=5Fpkg=5Fver...?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- functions/fpkg | 2 +- functions/main | 26 +++++++++++++------------- stage1/packages-update | 2 +- stage5/hv-install-1 | 2 +- stage5/packages-update | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/functions/fpkg b/functions/fpkg index 47f753f..406175b 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -385,7 +385,7 @@ fpkg() # Default subdirectory on server SRC_DIR=$(get_pkg_name ${PACK}) fi - SRC_DIR="${SRC_DIR}/$(get_pkg_ver_base ${PACK})" + SRC_DIR="${SRC_DIR}/$(get_pkg_ver2 ${PACK})" ;; sf) URL=${SOURCEFORGE_URL} diff --git a/functions/main b/functions/main index ec42a71..25e1bcb 100644 --- a/functions/main +++ b/functions/main @@ -157,9 +157,9 @@ get_pkg_ver() echo ${1} | sed "s!.*-\([0-9].*\)!\1!g" } -# Extracting the base version number from a complete package name. -# Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3.4) -get_pkg_ver_base() +# Extracting the first digit version number from a complete package name. +# Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3) +get_pkg_ver1() { # Checking for correct number of arguments if [ $# -ne 1 ]; then @@ -167,13 +167,12 @@ get_pkg_ver_base() return 1 fi - echo ${1} | sed "s!^.*-\([0-9]*\.[0-9]*\).*!\1!g" + echo ${1} | sed "s!^.*-\([0-9]*\)\..*!\1!g" } -# Extracting the 3-digit version number from a complete package name. -# Arg. #1: Complete package name with version -# (ex: linux-2.6.37.1 will output 2.6.37) -get_pkg_ver3() +# Extracting the first 2 digits version number from a complete package name. +# Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3.4) +get_pkg_ver2() { # Checking for correct number of arguments if [ $# -ne 1 ]; then @@ -181,12 +180,13 @@ get_pkg_ver3() return 1 fi - echo ${1} | sed "s!^.*-\([0-9]*\.[0-9]*\.[0-9]*\).*!\1!g" + echo ${1} | sed "s!^.*-\([0-9]*\.[0-9]*\).*!\1!g" } -# Extracting the base version number from a complete package name. -# Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3) -get_pkg_ver_major() +# Extracting the first 3 digit version number from a complete package name. +# Arg. #1: Complete package name with version +# (ex: linux-2.6.37.1 will output 2.6.37) +get_pkg_ver3() { # Checking for correct number of arguments if [ $# -ne 1 ]; then @@ -194,7 +194,7 @@ get_pkg_ver_major() return 1 fi - echo ${1} | sed "s!^.*-\([0-9]*\)\..*!\1!g" + echo ${1} | sed "s!^.*-\([0-9]*\.[0-9]*\.[0-9]*\).*!\1!g" } # Extracting the name from a complete package name. diff --git a/stage1/packages-update b/stage1/packages-update index 981511c..99d9efb 100755 --- a/stage1/packages-update +++ b/stage1/packages-update @@ -42,7 +42,7 @@ fpkg -m gnu ${NANO} fpkg ${XZ_UTILS} "http://tukaani.org/xz" # Chapter 7 -fpkg -s "linux/utils/util-linux/v$(get_pkg_ver_base ${UTIL_LINUX})" \ +fpkg -s "linux/utils/util-linux/v$(get_pkg_ver2 ${UTIL_LINUX})" \ ${UTIL_LINUX} ${KERNEL_URL} fpkg -m sf ${E2FSPROGS} fpkg ${SYSVINIT} "http://download.savannah.gnu.org/releases/sysvinit" diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index ed9878a..c36d410 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -182,6 +182,7 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then fi ipkg ${KERBEROS5} ipkg -m noac ${SENDMAIL} # Replace by SSMTP for workstation... +ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl" if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then ipkg -m noac ${PROCMAIL} @@ -208,7 +209,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then ipkg -m noac ${SQUIRRELMAIL} ipkg ${FETCHMAIL} "--with-ssl" - ipkg ${MUTT} "--enable-imap --with-ssl" # Subversion server (client was already installed in stage2) ipkg ${SUBVERSION} diff --git a/stage5/packages-update b/stage5/packages-update index 8f785b2..4ae8ea3 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -63,9 +63,9 @@ fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER} fpkg ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick" fpkg -m fd -s "none" ${POPPLER} fpkg -m gnome ${LIBRSVG} -fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver_base ${BABL})" -fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver_base ${BABL})" -fpkg ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver_base ${GIMP})" +fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver2 ${BABL})" +fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver2 ${BABL})" +fpkg ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver2 ${GIMP})" fpkg -m sf -s "gimp-print" -e "tar.bz2" ${GUTENPRINT} fpkg -m sf -s "boost" ${BOOST} fpkg -m sf ${INKSCAPE} @@ -130,11 +130,11 @@ fpkg -m sf ${GRIP} fpkg -m sf -e "tar.bz2" ${CDRDAO} fpkg -m sf -e "tar.bz2" ${EASYTAG} fpkg -e "tar.gz" ${LILYPOND} \ - "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})" + "http://lilypond.org/download/sources/v$(get_pkg_ver2 ${LILYPOND})" fpkg -m hv ${FFMPEG} fpkg ${SYLPHEED} \ - "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})" + "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})" fpkg -m hv ${NSS} fpkg -f "${FIREFOX}.source" ${FIREFOX} \ "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source" @@ -198,7 +198,7 @@ fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt" #fpkg_mis ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads" -GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver_base ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA}) +GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver2 ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA}) #fpkg ${LIBGEDA} ${GEDA_BASE_URL} #fpkg ${GEDA_SYMBOLS} ${GEDA_BASE_URL} -- 2.20.1