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

File:

• scripts/patch/ncurses-patch.sh (modified) (8 diffs)

scripts/patch/ncurses-patch.sh

@@ -16 +16 @@
 # Get Patch Names
 #
-cd ~/tmp
+cd /usr/src
 wget ftp://invisible-island.net/ncurses/${VERSION}/ --no-remove-listing
 ROLLUP=$(cat index.html | grep bz2 | cut -f2 -d'>' | cut -f1 -d'<' | tail -n 1)
@@ -26 +26 @@
 # Download Ncurses Source
 #
-cd ~/tmp
 if ! [ -e ncurses-${VERSION}.tar.gz ]; then
   wget ftp://invisible-island.net/ncurses/ncurses-${VERSION}.tar.gz
@@ -33 +32 @@
 # 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 ncurses | grep "${VERSION}" | grep branch_update | cut -f2 -d'"' | cut -f1 -d'"'| cut -f4 -d- | cut -f1 -d. | tail -n 1)
@@ -41 +40 @@
 # Cleanup Directory
 #
-cd ~/tmp
 rm -rf ncurses-${VERSION} ncurses-${VERSION}.orig
 tar xvf ncurses-${VERSION}.tar.gz
 cp -ar ncurses-${VERSION} ncurses-${VERSION}.orig
+cd ncurses-${VERSION}
 
 # Download and Apply Rollup Patch
 #
-cd ~/tmp/ncurses-${VERSION}
 CURRENTDIR=$(pwd -P)
-mkdir ~/tmp/ncurses-${VERSION}-patches
-cd ~/tmp/ncurses-${VERSION}
+mkdir /tmp/ncurses-${VERSION}
+cd /tmp/ncurses-${VERSION}
 if [ "${ROLLUP}" != "" ]; then
   echo "Getting Rollup ${ROLLUP} Patch..."
-  cd ~/tmp/ncurses-${VERSION}-patches
   wget --quiet ftp://invisible-island.net/ncurses/${VERSION}/${ROLLUP}
   cd ${CURRENTDIR}
   echo "Applying Rollup ${ROLLUP} Patch..."
-  cp ~/tmp/ncurses-${VERSION}-patches/${ROLLUP} ${CURRENTDIR}/${ROLLUP}
+  cp /tmp/ncurses-${VERSION}/${ROLLUP} ${CURRENTDIR}/${ROLLUP}
   bunzip2 ${ROLLUP}
   ROLLUP2=$(echo ${ROLLUP} | sed -e 's/.bz2//g')
@@ -66 +63 @@
 # Download and Apply Patches
 #
-install -d ~/tmp/ncurses-${VERSION}-patches
-cd ~/tmp/ncurses-${VERSION}
-CURRENTDIR=$(pwd -P)
 for file in ${FILES}; do
   if [ "${ROLLPATCH}" != "" ]; then
@@ -76 +70 @@
   fi
   if [ "${TEST}" = "0" ]; then
-    cd ~/tmp/ncurses-${VERSION}-patches
+    cd /tmp/ncurses-${VERSION}
     echo "Getting Patch ${file}..."
     wget --quiet ftp://invisible-island.net/ncurses/${VERSION}/${file}
     cd ${CURRENTDIR}
-    gunzip -c ~/tmp/ncurses-${VERSION}-patches/${file} | patch --dry-run -s -f -Np1
+    gunzip -c /tmp/ncurses-${VERSION}/${file} | patch --dry-run -s -f -Np1
     if [ "$?" = "0" ]; then
       echo "Apply Patch ${file}..."
-      gunzip -c ~/tmp/ncurses-${VERSION}-patches/${file} | patch -Np1
+      gunzip -c /tmp/ncurses-${VERSION}/${file} | patch -Np1
       LASTFILE=$(echo ${file} | cut -f2 -d. | cut -f2 -d-)
     fi
@@ -91 +85 @@
 # Cleanup Directory
 #
-cd ~/tmp
-cd ncurses-${VERSION}
+# Cleanup Directory
+#
 for dir in $(find * -type d); do
-  cd ~/tmp/ncurses-${VERSION}/${dir}
+  cd /usr/src/ncurses-${VERSION}/${dir}
   for file in $(find . -name '*~'); do
     rm -f ${file}
@@ -102 +96 @@
   done
 done
-cd ~/tmp/ncurses-${VERSION}
+cd /usr/src/ncurses-${VERSION}
 rm -f *~ *.orig
 
 # Create Patch
 #
-cd ~/tmp
-echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Date: `date +%m-%d-%Y`" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Initial Package Version: ${VERSION}" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Origin: Upstream" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Upstream Status: Applied" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Description: This is a branch update for NCurses-${VERSION}, and should be" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "             rechecked periodically. This patch covers up to ${VERSION}-${LASTFILE}." >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "" >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-diff -Naur ncurses-${VERSION}.orig ncurses-${VERSION} >> ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
-echo "Created ~/patches/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch."
-
-# Cleanup Directory
-#
-cd ~/tmp
-rm -rf ncurses-${VERSION} ncurses-${VERSION}.orig
+cd /usr/src
+echo "Submitted By: Jim Gifford (jim at cross-lfs dot org)" > ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Date: `date +%m-%d-%Y`" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Initial Package Version: ${VERSION}" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Origin: Upstream" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Upstream Status: Applied" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Description: This is a branch update for NCurses-${VERSION}, and should be" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "             rechecked periodically. This patch covers up to ${VERSION}-${LASTFILE}." >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "" >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+diff -Naur ncurses-${VERSION}.orig ncurses-${VERSION} >> ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch
+echo "Created /usr/src/ncurses-${VERSION}-branch_update-${PATCH_NUM}.patch."