Update [1] on build-docu.sh for opnfvdocs project

[releng.git] / jjb / opnfvdocs / build-docu.sh

diff --git a/jjb/opnfvdocs/build-docu.sh b/jjb/opnfvdocs/build-docu.sh
index 64ddf7d..2abf127 100644 (file)
--- a/jjb/opnfvdocs/build-docu.sh
+++ b/jjb/opnfvdocs/build-docu.sh
@@ -10,26 +10,22 @@ done < <(find . -type f -iname '*.rst' -print0)
 for file in "${{files[@]}}"; do
 
   file_cut="${{file%.*}}"
-  gs_cp_folder="${{dirname "${{file}}"}}"
-
-  html_file=$file_cut".html"
+  gs_cp_folder="${{file_cut}}"
 
     echo "rst2html $file"
     rst2html $file | gsutil cp -L gsoutput.txt - \
-    gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file")
+    gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html
     gsutil setmeta -h "Content-Type:text/html" \
                    -h "Cache-Control:private, max-age=0, no-transform" \
-                   gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$html_file")
+                   gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html
     cat gsoutput.txt
 
-  pdf_file="$file_cut"".pdf"
-
     echo "rst2pdf $file"
     rst2pdf "$file" -o - | gsutil cp -L gsoutput.txt - \
-    gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_file")
+    gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html
     gsutil setmeta -h "Content-Type:application/pdf" \
                    -h "Cache-Control:private, max-age=0, no-transform" \
-                   gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder"/$(basename "$pdf_file")
+                   gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".pdf
     cat gsoutput.txt
 
 done