Changes in scripts/patch/vim-patch.sh [d8a9d8b:54f612f]

File:

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

scripts/patch/vim-patch.sh

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