Fixed a bug in the package generation, made manual instructions clearer

tkedwards · Dec 12, 2016 · dea5213 · dea5213
1 parent 35e91a1
commit dea5213
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/regenerate_all.sh b/regenerate_all.sh
@@ -77,10 +77,10 @@ else
         YESORNO=$REPLY
         if [ "$YESORNO" = "y" ]; then
                 ## Prepare the packaging directories
-                echo "Extracting the packaging directory from the most recent Debian source package (e.g. wiktionarytodict_20160110.dsc)"
                 cd "$SCRIPTDIR"/packaging/
-                CURRENT_DSC_FILE="`ls -1 wiktionarytodict_*.dsc | sort | tail -1`"
-                CURRENT_RELEASE_DIR=`echo "${CURRENT_DSC_FILE%-*}" | tr _ -` #e.g. wiktionarytodict-20160110 
+                CURRENT_DSC_FILE="`ls -1 wiktionarytodict_*.dsc | sort | tail -1`" #e.g. wiktionarytodict_20160110.dsc
+                CURRENT_RELEASE_DIR=`echo ${CURRENT_DSC_FILE%.*} | tr _ -` # remove the extension and replace _ with - e.g. wiktionarytodict-20160110
+                echo "Extracting the packaging directory from the most recent Debian source package ($CURRENT_RELEASE_DIR)"
                 cd "$SCRIPTDIR"/packaging/ && dpkg-source -x $CURRENT_DSC_FILE # extract the most recent existing source package, e.g. wiktionarytodict_20160110-1.dsc
                 NEW_RELEASE_TAR="`ls -1 wiktionarytodict_*.orig.tar.gz | sort | tail -1`" # get the name of the most recent wiktionarytodict_*.orig.tar.gz file in packaging/, this should've been copied in at the end of the regenerate dictionaries procedure above
                 tar -xf "$NEW_RELEASE_TAR" # extract out original source

diff --git a/regenerate_all_manualsteps.txt b/regenerate_all_manualsteps.txt
@@ -4,9 +4,9 @@
 - Uploaded the new source package to the PPA with:
 dput ppa:tkedwards/wiktionarytodict-ppa wiktionarytodict_VERSION_source.changes
 
-- test the packages
+- Wait for the packages to build and then publish (should be all automatic, takes up to 10 mins) and then test the packages
 
-- Ensure that the upload was successful and then select View Package Details->'Copy Packages' for each supported distro version (e.g. trusty, wily, xenial). Make sure to only copy binaries: https://launchpad.net/~tkedwards/+archive/ubuntu/wiktionarytodict-ppa
+- If the test was successful select View Package Details->'Copy Packages' for each supported distro version (e.g. trusty, wily, xenial). Make sure to only copy binaries: https://launchpad.net/~tkedwards/+archive/ubuntu/wiktionarytodict-ppa
 
 *Clean-up*
 - To save space, delete $SCRIPTDIR/packaging/wiktionarytodict-VERSION/ (the contents of it are preserved in $SCRIPTDIR/packaging/wiktionarytodict_VERSION.orig.tar.gz and ...diff.gz) and, if not using Launchpad and instead using binary packages, move $SCRIPTDIR/packaging/*.deb to the local repo