From 5dd64112edac54c49aa0a677bc7a1b67e6ed3942 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Mon, 4 Jun 2012 17:32:36 +0200 Subject: [PATCH] Refactoring: code deduplication: Merge hook files with just whitespace differences --- hooks/centos-4/20-setup-yum | 47 +------------------------------ hooks/centos-5/20-setup-yum | 48 +------------------------------- hooks/common/20-setup-yum | 43 ++++++++++++++++++++++++++++ hooks/fedora-core-6/20-setup-yum | 47 +------------------------------ 4 files changed, 46 insertions(+), 139 deletions(-) mode change 100755 => 120000 hooks/centos-4/20-setup-yum mode change 100755 => 120000 hooks/centos-5/20-setup-yum create mode 100755 hooks/common/20-setup-yum mode change 100755 => 120000 hooks/fedora-core-6/20-setup-yum diff --git a/hooks/centos-4/20-setup-yum b/hooks/centos-4/20-setup-yum deleted file mode 100755 index 8fed170..0000000 --- a/hooks/centos-4/20-setup-yum +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# This script sets up the Yum for CentOS4. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Update yum -# -if [ ! -d ${prefix}/proc ]; then - mkdir -p ${prefix}/proc -fi -mount -o bind /proc ${prefix}/proc -chroot ${prefix} /usr/bin/yum update -umount ${prefix}/proc - -# -# Log our finish -# -logMessage Script $0 finished - - - - diff --git a/hooks/centos-4/20-setup-yum b/hooks/centos-4/20-setup-yum new file mode 120000 index 0000000..51cb79d --- /dev/null +++ b/hooks/centos-4/20-setup-yum @@ -0,0 +1 @@ +../common/20-setup-yum \ No newline at end of file diff --git a/hooks/centos-5/20-setup-yum b/hooks/centos-5/20-setup-yum deleted file mode 100755 index acb363d..0000000 --- a/hooks/centos-5/20-setup-yum +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# This script sets up the Yum for CentOS4. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Update yum -# -if [ ! -d ${prefix}/proc ]; then - mkdir -p ${prefix}/proc -fi -mount -o bind /proc ${prefix}/proc -chroot ${prefix} /usr/bin/yum update -umount ${prefix}/proc - - -# -# Log our finish -# -logMessage Script $0 finished - - - - diff --git a/hooks/centos-5/20-setup-yum b/hooks/centos-5/20-setup-yum new file mode 120000 index 0000000..51cb79d --- /dev/null +++ b/hooks/centos-5/20-setup-yum @@ -0,0 +1 @@ +../common/20-setup-yum \ No newline at end of file diff --git a/hooks/common/20-setup-yum b/hooks/common/20-setup-yum new file mode 100755 index 0000000..f5410e0 --- /dev/null +++ b/hooks/common/20-setup-yum @@ -0,0 +1,43 @@ +#!/bin/sh +# +# This script sets up the Yum for CentOS4. +# +# Steve +# -- +# http://www.steve.org.uk/ + + +prefix=$1 + + +# +# Source our common functions +# +if [ -e /usr/lib/xen-tools/common.sh ]; then + . /usr/lib/xen-tools/common.sh +else + . ./hooks/common.sh +fi + + +# +# Log our start +# +logMessage Script $0 starting + + +# +# Update yum +# +if [ ! -d ${prefix}/proc ]; then + mkdir -p ${prefix}/proc +fi +mount -o bind /proc ${prefix}/proc +chroot ${prefix} /usr/bin/yum update +umount ${prefix}/proc + + +# +# Log our finish +# +logMessage Script $0 finished diff --git a/hooks/fedora-core-6/20-setup-yum b/hooks/fedora-core-6/20-setup-yum deleted file mode 100755 index 84a7ddf..0000000 --- a/hooks/fedora-core-6/20-setup-yum +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# This script sets up the Yum for CentOS4. -# -# Steve -# -- -# http://www.steve.org.uk/ - - -prefix=$1 - - -# -# Source our common functions -# -if [ -e /usr/lib/xen-tools/common.sh ]; then - . /usr/lib/xen-tools/common.sh -else - . ./hooks/common.sh -fi - - -# -# Log our start -# -logMessage Script $0 starting - - -# -# Update yum -# -if [ ! -d ${prefix}/proc ]; then - mkdir -p ${prefix}/proc -fi -mount -o bind /proc ${prefix}/proc -chroot ${prefix} /usr/bin/yum update -umount ${prefix}/proc - -# -# Log our finish -# -logMessage Script $0 finished - - - - diff --git a/hooks/fedora-core-6/20-setup-yum b/hooks/fedora-core-6/20-setup-yum new file mode 120000 index 0000000..51cb79d --- /dev/null +++ b/hooks/fedora-core-6/20-setup-yum @@ -0,0 +1 @@ +../common/20-setup-yum \ No newline at end of file