fix for booting isolinux config via GRUB

[fsf-member-card-builder.git] / install-extras.sh

diff --git a/install-extras.sh b/install-extras.sh
index b9e04801a47eb80daeff1c465122ae15c4a34427..3dc931ec587e9b3eecd904cfdad1d9f30fbea2a6 100755 (executable)
--- a/install-extras.sh
+++ b/install-extras.sh
@@ -23,8 +23,8 @@ set -e
 usage(){
 echo
 echo You need to run this script as root
-echo Usage: sudo $0 sources.iso /dev/sdX
-echo Example: sudo $0 trisquel_9.0fsf_sources.iso /dev/sdb
+echo Usage: sudo $0 sources.tar /dev/sdX
+echo Example: sudo $0 trisquel_11.0_sources.tar /dev/sdb
 echo
 echo WARNING!: This script can bite your dog. Use it with care, backup your data.
 echo
@@ -34,13 +34,11 @@ exit 1
 [ $(id -u) != 0 ] && usage
 [ $# != 2 ] && usage
 
-ISO=$1
+TAR=$1
 DEV=$2
 
-ISOTMP=$(mktemp -d)
 DEVTMP=$(mktemp -d)
 
-mount -o loop $ISO $ISOTMP
 mount ${DEV}1 $DEVTMP
 
 
@@ -62,7 +60,7 @@ cp checksums.sha256 $DEVTMP/source/
 
 
 cp html/* $DEVTMP/fsf/
-rm $DEVTMP/fsf/reset.css
+rm -f $DEVTMP/fsf/reset.css
 
 
 ###
@@ -70,11 +68,15 @@ rm $DEVTMP/fsf/reset.css
 ### 
 
 
+old_dir="$(pwd)"
+
 cd $DEVTMP/fsf/GNUAV
 
-mkdir lp2023_audio ;  cd lp2023_audio
+mkdir -p lp2023_audio ;  cd lp2023_audio
 
+#
 # In GMG Postgres DB: select * from core__mediafiles where file_path like '%2023%.ogg';
+#
 
 wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2765/lp2023-jupiter-sunday-1720.ogg'
 wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2766/lp2023-jupiter-saturday-1225.ogg'
@@ -112,44 +114,71 @@ wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2797/lp2023-nept
 wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2798/lp2023-saturn-saturday-1500.ogg'
 wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2866/lp2023-jupiter-sunday-1000.ogg'
 wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2875/lp2023-saturn-sunday-1620.ogg'
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3433/lp2023-workshop-april-10.ogg'
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3435/lp2023-workshop-april-24.ogg'
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3437/lp2023-workshop-may-01.ogg'
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3439/lp2023-workshop-may-08.ogg'
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3441/lp2023-workshop-may-15.ogg'
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3443/lp2023-bigcode-may-30.ogg'
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3445/lp2023-worldvista-june-05.ogg'
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3443/lp2023-bigcode-may-30.ogg' -O lp2023-saturn-sunday-1335.ogg
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/3445/lp2023-worldvista-june-05.ogg' -O lp2023-saturn-sunday-1430.ogg
 
 
 cd ..
 
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/415/snowden-final.webm' -O lp2016_snowden.webm
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/167/FSF_640x360.webm'
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2070/FSFKeynotewithSlidesHighRes.ogg'
+wget 'https://static.fsf.org/nosvn/FSF30-video/FSF_30_720p.webm'
+wget 'https://static.fsf.org/nosvn/member-cards/extra-media/2022-02-07/why-free-software.webm'
+wget 'https://static.fsf.org/nosvn/member-cards/extra-media/2022-02-07/fsfs-ii-2-1.pdf'
+wget 'https://audio-video.gnu.org/video/TEDxGE2014_Stallman05_LQ.webm'
 
-##
-## These are distributed in trisquel_9.0-fsf_i686.iso. See README.md for details
-##
-#wget 'https://media.libreplanet.org/mgoblin_media/media_entries/415/snowden-final.webm'
-#wget 'https://media.libreplanet.org/mgoblin_media/media_entries/167/FSF_640x360.webm'
-#wget 'https://static.fsf.org/nosvn/FSF30-video/FSF_30_720p.webm'
-#wget 'https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-360.webm'
-#wget 'https://static.fsf.org/nosvn/videos/fsf-heroes/videos/The-University-of-Costumed-Heroes-360p.webm'
-#wget 'https://static.fsf.org/nosvn/member-cards/extra-media/2022-02-07/FSFKeynotewithSlidesHighRes.ogg'
-#wget 'https://static.fsf.org/nosvn/member-cards/extra-media/2022-02-07/why-free-software.webm'
-#wget 'https://static.fsf.org/nosvn/member-cards/extra-media/2022-02-07/fsfs-ii-2-1.pdf'
-#wget 'https://audio-video.gnu.org/video/TEDxGE2014_Stallman05_LQ.webm'
-
-mv snowden-final.webm lp2016_snowden.webm
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2746/escape-to-freedom-720p.webm'
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2745/Fight-to-Repair-720p.webm'
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2744/FSF-Rewind-720p.webm'
 
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2070/FSFKeynotewithSlidesHighRes.ogg'
 
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2335/grandsun1715.webm' -O lp2020_kahle.webm
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2332/grandsat0945.webm' -O lp2020_younghackers.webm
+###
+### media included in trisquel_11.0-fsf_amd64.iso
+###
+#
+# other/benjamin_mako_hill-revealing_errors.ogg
+# other/benjamin_mako_hill-revealing_errors.txt
+# other/bradley_kuhn-software_freedom_and_the_gnu_generation.ogg
+# other/bradley_kuhn-software_freedom_and_the_gnu_generation.txt
+# other/eben_moglen-free_software_and_free_media.ogg
+# other/eben_moglen-free_software_and_free_media.txt
+# other/fsf-2009-jeremyallison.ogv
+# other/fsf-2009-jeremyallison.txt
+# other/fsf-2009-peterbrown.ogv
+# other/fsf-2009-peterbrown.txt
+# other/fsf-shoetool-360.txt
+# other/fsf-shoetool-360.webm
+# other/stephen_fry-happy_birthday_gnu.ogg
+# other/stephen_fry-happy_birthday_gnu.ogv
+# other/stephen_fry-happy_birthday_gnu.txt
+# other/The-University-of-Costumed-Heroes-360p.txt
+# other/The-University-of-Costumed-Heroes-360p.webm
+# rms/rms-copyright_versus_community_in_the_age_of_computer_networks.ogg
+# rms/rms-copyright_versus_community_in_the_age_of_computer_networks.txt
+# rms/rms-essays.pdf
+# rms/rms-essays.txt
+# rms/rms-free_software_freedom_and_community.ogg
+# rms/rms-free_software_freedom_and_community.txt
+# rms/rms-gplv3_launch.ogg
+# rms/rms-gplv3_launch.txt
+# rms/rms-patents_barriers_to_development.ogg
+# rms/rms-patents_barriers_to_development.txt
+# rms/rms-the_dangers_of_software_patents.ogg
+# rms/rms-the_dangers_of_software_patents.txt
+# rms/rms-what_is_free_software.ogg
+# rms/rms-what_is_free_software.txt
+
+
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2763/lp2023-jupiter-sunday-1720.webm' -O lp2023_repair.webm
+wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2799/lp2023-jupiter-saturday-1225.webm' -O lp2023_education.webm
 
 ###
-### copy over Trisquel 9 sources
+### copy over Trisquel 11 sources
 ### 
 
 
-cp -vr $ISOTMP/* $DEVTMP/source/ || true
+tar -C $DEVTMP/source/ --no-same-owner --touch --no-overwrite-dir -xvf $TAR || true
 
 
 ###
@@ -160,11 +189,11 @@ cp -vr $ISOTMP/* $DEVTMP/source/ || true
 sync
 sleep 3
 
+cd "$old_dir"
+
 umount $DEVTMP
-umount $ISOTMP
 
 rmdir $DEVTMP
-rmdir $ISOTMP
 
 sync