url fix + small adjustments and corrections

1 files changed, 20 insertions, 10 deletions

diff --git a/mageia_doc_binaries.sh b/mageia_doc_binaries.sh
index eda6a296..742c25e2 100755
--- a/mageia_doc_binaries.sh
+++ b/mageia_doc_binaries.sh
@@ -2,10 +2,17 @@
 #
 # Fetch EPUB and PDF files from http://docteam.mageia.nl and copy properly named file to git
 #
-# Filip Komar, June 2017
+# Filip Komar, June 2017, 2019
 # @license GPL v2
 # @author Filip
-# @copyright 2017
+# @copyright 2017, 2019
+#
+# "Usage: mageia_doc_binaries.sh "/mirror/dir_name/" "/local_git/dir_name/"
+# but first adjust variables bellow
+
+release=7
+epub_dir='https://docteam.mageia.org.uk/EPUB/'
+pdf_dir='https://docteam.mageia.org.uk/Mga7/PDF/'
 
 function rename_binary {
     doc_regex="(.+)($1)-(cover-)?(.+)-(PDF|EPUB).(.+)"
@@ -61,18 +68,20 @@ else
     local_git="$2"
 fi
 
+# save pwd to saved_dir
+saved_dir=$(pwd)
+cd "$local_git"
+
 git_clean=`git diff --name-only`
 if [ ! -z $git_clean ]; then
     echo "Please commit changes first"
     git status
+
+    # restore saved_dir
+    cd "$saved_dir"
     exit 2
 fi
 
-# save pwd to saved_dir
-saved_dir=$(pwd)
-cd "$local_git"
-
-release=6
 list_file="$download_dir/doc/mga$release/manuals_in_languages.txt"
 
 wget_options="--directory-prefix=$download_dir/doc/mga$release --timestamping --no-host-directories --recursive --no-parent --quiet"
@@ -81,14 +90,15 @@ echo "Mageia PDF and EPUB management tool (current release=$release):"
 echo ''
 
 echo 'Downloading EPUB files...'
-wget $wget_options --accept epub http://docteam.mageia.nl/EPUB/
+wget $wget_options --accept epub $epub_dir
 
 echo 'Downloading PDF files...'
-wget $wget_options --accept pdf http://docteam.mageia.nl/PDF/
+wget $wget_options --accept pdf $pdf_dir
 
 echo "Manuals in PDF and EPUB form are available in languages: " > "$list_file"
 
 echo 'Renaming and pushing to git...'
+# remember to fix 2nd argument to real directories:
 rename_binary 'DrakX' 'EPUB/installer'
 rename_binary 'DrakX' 'PDF/installer'
 
@@ -102,7 +112,7 @@ rename_binary 'DrakLive' 'EPUB/draklive'
 rename_binary 'DrakLive' 'PDF/draklive'
 
 if [ "$commit_needed" == "yes" ]; then
-    echo Mageia 6 > "$local_git/doc_binaries_for_website/mga$release/date.txt"
+    echo Mageia $release > "$local_git/doc_binaries_for_website/mga$release/date.txt"
     LC_ALL=C date -u >> "$local_git/doc_binaries_for_website/mga$release/date.txt"
     git add "doc_binaries_for_website/mga$release/date.txt"
     git commit -m "adding/updating date.txt file (mirror upload date check) for release $release"