Changes in scripts/patch/bash-patch.sh [d8a9d8b:c7ef534]

File:

• scripts/patch/bash-patch.sh (modified) (6 diffs)

scripts/patch/bash-patch.sh

@@ -16 +16 @@
 # Get the # of Patches
 #
-install -d ~/tmp
-cd ~/tmp
+cd /usr/src
 wget ftp://ftp.cwru.edu/pub/bash/bash-${VERSION}-patches/ --no-remove-listing
 VERSION2=$(echo ${VERSION} | sed -e 's/\.//g')
@@ -34 +33 @@
 # Set Patch Number
 #
-cd ~/tmp
+cd /usr/src
 wget http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/ --no-remove-listing
 PATCH_NUM=$(cat index.html | grep bash | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
@@ -42 +41 @@
 # Cleanup Directory
 #
-cd ~/tmp
 rm -rf bash-${VERSION} bash-${VERSION}.orig
 tar xvf bash-${VERSION}.tar.gz
 cp -ar bash-${VERSION} bash-${VERSION}.orig
+cd bash-${VERSION}
+CURRENTDIR=$(pwd -P)
 
 # Download and Apply Patches
 #
-install -d ~/tmp/bash-${VERSION}-patches
-cd ~/tmp/bash-${VERSION}
-CURRENTDIR=$(pwd -P)
 PATCHURL=ftp://ftp.cwru.edu/pub/bash/bash-${VERSION}-patches
+mkdir /tmp/bash-${VERSION}
 COUNT=1
 while [ ${COUNT} -le ${FILES} ]; do
-  cd ~/tmp/bash-${VERSION}           
+  cd /tmp/bash-${VERSION}           
   DLCOUNT="${COUNT}"
   SKIPME=no
@@ -73 +71 @@
   if [ "${SKIPME}" != "yes" ]; then
     if ! [ -e ${VERSION}.${DLCOUNT} ]; then
-      cd ~/tmp/bash-${VERSION}-patches
       wget --quiet ${PATCHURL}/bash${VERSION2}-${DLCOUNT}
     fi
     cd ${CURRENTDIR}
-    patch --dry-run -s -f -Np0 -i ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
+    patch --dry-run -s -f -Np0 -i /tmp/bash-${VERSION}/bash${VERSION2}-${DLCOUNT}
     if [ "$?" = "0" ]; then
       echo "Patch bash${VERSION2}-${DLCOUNT} applied"
-      patch -s -Np0 -i ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
+      patch -s -Np0 -i /tmp/bash-${VERSION}/bash${VERSION2}-${DLCOUNT}
     else
      echo "Patch bash${VERSION2}-${DLCOUNT} not applied"
-     rm -f ~/tmp/bash-${VERSION}-patches/bash${VERSION2}-${DLCOUNT}
+     rm -f /tmp/bash-${VERSION}/bash${VERSION2}-${DLCOUNT}
      SKIPPED="${SKIPPED} ${DLCOUNT}"
     fi
@@ -92 +89 @@
 # Cleanup Directory
 #
-cd ~/tmp/bash-${VERSION}
+
 for dir in $(find * -type d); do
-  cd ~/tmp/bash-${VERSION}/${dir}
+  cd /usr/src/bash-${VERSION}/${dir}
   for file in $(find . -name '*~'); do
     rm -f ${file}
@@ -102 +99 @@
   done
 done
-cd ~/tmp/bash-${VERSION}
+cd /usr/src/bash-${VERSION}
 rm -f *~ *.orig
 
 # Create Patch
 #
-cd ~/tmp
-install -d ~/patches
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Origin: Upstream" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Upstream Status: Applied" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+cd /usr/src
+echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Date: `date +%m-%d-%Y`" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Initial Package Version: ${VERSION}" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Origin: Upstream" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Upstream Status: Applied" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Description: Contains all upstream patches up to ${VERSION}-${FILES}" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
 if [ -n "${SKIPPED}" ]; then
-  echo "             The following patches were skipped" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-  echo "            ${SKIPPED}" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+  echo "             The following patches were skipped" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+  echo "            ${SKIPPED}" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
 fi
-echo "" >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-diff -Naur bash-${VERSION}.orig bash-${VERSION} >> ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Created ~/patches/bash-${VERSION}-branch_update-${PATCH_NUM}.patch."
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf bash-${VERSION} bash-${VERSION}.orig
+echo "" >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+diff -Naur bash-${VERSION}.orig bash-${VERSION} >> bash-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Created /usr/src/bash-${VERSION}-branch_update-${PATCH_NUM}.patch."