volume 5

books/volume-5.sb

@@ -0,0 +1,34 @@
+{
+"template" : "patacrep.tmpl",
+"lang" : "french",
+"bookoptions" : [
+    "diagram",
+    "lilypond",
+    "pictures"
+  ],
+"booktype" : "chorded",
+"picture" : "The_Music_Machine_by_hit_squad",
+"picturecopyright" : "hit-squad @ deviantart.com",
+"subtitle" : "Tome 5",
+"songs" : [
+    "Anis/Dans_tes_yeux.sg",
+    "Debout_Sur_Le_Zinc/Scylla.sg",
+    "Gary_Jules/Mad_world.sg",
+    "Jali/Espanola.sg",
+    "La_Rue_Ketanou/Sao_loucas.sg",
+    "Le_clandestin/Rue_Grenelle.sg",
+    "Les_Booze_Brothers/Fields_of_Athenry.sg",
+    "Les_Cowboys_Fringants/8_secondes.sg",
+    "Les_Cowboys_Fringants/Ces_temps_ci.sg",
+    "Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg",
+    "The_Dubliners/The_wild_rover.sg",
+    "Thomas_Fersen/Bambi.sg",
+    "Thomas_Fersen/Croque.sg",
+    "Thomas_Fersen/Irene.sg",
+    "Thomas_Fersen/Le_bouton.sg",
+    "Thomas_Fersen/Les_cravates.sg",
+    "Thomas_Fersen/L_histoire_d_une_heure.sg",
+    "Thomas_Fersen/Louise.sg",
+    "Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg",
+    "Yves_Simon/Les_bateaux_du_metro.sg"]
+}

utils/header-last-volume

@@ -7,7 +7,7 @@
     "pictures"
   ],
 "booktype" : "chorded",
-"picture" : "music_by_lauratheartist",
-"picturecopyright" : "LauraTheArtist @ deviantart.com",
-"subtitle" : "Tome 4",
+"picture" : "The_Music_Machine_by_hit_squad",
+"picturecopyright" : "hit-squad @ deviantart.com",
+"subtitle" : "Tome 5",
 "songs" : [

utils/last-volume.sh

@@ -14,42 +14,33 @@ cd songs
 ls -1 */*.sg > ../res1
 cd ..
 
-#get volume 1 list
-tail -n +13 "$BOOKS_DIR/volume-1.sb" > tmp1
-head -n -2 tmp1 > list1
-sed -i -e "s/\",//g" -e "s/    \"//g" -e "s/\"//g" list1
+for i in 1 2 3 4
+do
+    #get volume i list
+    tail -n +14 "$BOOKS_DIR/volume-$i.sb" > tmp$i
+    head -n -2 tmp$i > list$i
+    sed -i -e "s/\",//g" -e "s/    \"//g" -e "s/\"//g" list$i
 
-#remove volume 1 songs
-grep -vf list1 res1 > res2 
-
-#get volume 2 list
-tail -n +14 "$BOOKS_DIR/volume-2.sb" > tmp2
-head -n -2 tmp2 > list2
-sed -i -e "s/\",//g" -e "s/    \"//g" -e "s/\"//g" list2
-
-#remove volume 2 songs
-grep -vf list2 res2 > res3 
-
-#get volume 3 list
-tail -n +14 "$BOOKS_DIR/volume-3.sb" > tmp3
-head -n -2 tmp3 > list3
-sed -i -e "s/\",//g" -e "s/    \"//g" -e "s/\"//g" list3
-
-#remove volume 3 songs
-grep -vf list3 res3 > res4 
+    #remove volume i songs
+    grep -vf list$i res$i > res$(($i+1))
+done
 
 #format song list
-sed -i -e "s/^/    \"/g" -e "s/$/\",/g" res4
-head -c -2 res4 > res
+sed -i -e "s/^/    \"/g" -e "s/$/\",/g" res$(($i+1))
+head -c -2 res$(($i+1)) > res
 
 
-#make volume 4 sb file
-cat utils/header-last-volume > "$BOOKS_DIR/volume-4.sb"
-cat res >> "$BOOKS_DIR/volume-4.sb"
-echo "]" >> "$BOOKS_DIR/volume-4.sb"
-echo "}" >> "$BOOKS_DIR/volume-4.sb"
+#make volume i+1 sb file
+cat utils/header-last-volume > "$BOOKS_DIR/volume-$(($i+1)).sb"
+cat res >> "$BOOKS_DIR/volume-$(($i+1)).sb"
+echo "]" >> "$BOOKS_DIR/volume-$(($i+1)).sb"
+echo "}" >> "$BOOKS_DIR/volume-$(($i+1)).sb"
 
 #remove tmp files
-rm -f res res1 res2 res3 res4 list1 list2 list3 tmp1 tmp2 tmp3
+for i in 1 2 3 4
+do
+  rm -f res$i list$i tmp$i
+done
+rm -f res res$(($i+1))
 
 export GREP_OPTIONS="$GREP"

utils/release.sh

@@ -59,6 +59,7 @@ make volume-1.pdf
 make volume-2.pdf 
 make volume-3.pdf 
 make volume-4.pdf 
+make volume-5.pdf 
 make english.pdf 
 make french.pdf 
 make songbook.pdf 
@@ -76,7 +77,7 @@ then
     ./utils/new-songs-list.sh | cat - NEWS > /tmp/out && mv -f /tmp/out NEWS
     echo "\nversion $MAIN.$MAJOR.$MINOR\n" | cat - NEWS > /tmp/out && mv -f /tmp/out NEWS
     git add templates/*.tmpl
-    git add books/volume-4.sb NEWS
+    git add books/volume-5.sb NEWS
     git commit -m "patacrep release version $MAIN.$MAJOR.$MINOR" 
     git tag "patacrep_$MAIN.$MAJOR.$MINOR"
 fi