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 644ebafb7c0f73d9b4a07d5ea644a9c3580fe1d1..3dc931ec587e9b3eecd904cfdad1d9f30fbea2a6 100755 (executable)
--- a/install-extras.sh
+++ b/install-extras.sh
@@ -68,6 +68,8 @@ rm -f $DEVTMP/fsf/reset.css
 ### 
 
 
+old_dir="$(pwd)"
+
 cd $DEVTMP/fsf/GNUAV
 
 mkdir -p lp2023_audio ;  cd lp2023_audio
@@ -120,8 +122,8 @@ 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/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'
@@ -167,7 +169,6 @@ wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2744/FSF-Rewind-
 # rms/rms-what_is_free_software.ogg
 # rms/rms-what_is_free_software.txt
 
-wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2070/FSFKeynotewithSlidesHighRes.ogg'
 
 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
@@ -177,7 +178,7 @@ wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2799/lp2023-jupi
 ### 
 
 
-tar -C $DEVTMP/source/ --no-same-owner -xvf $TAR || true
+tar -C $DEVTMP/source/ --no-same-owner --touch --no-overwrite-dir -xvf $TAR || true
 
 
 ###
@@ -188,6 +189,8 @@ tar -C $DEVTMP/source/ --no-same-owner -xvf $TAR || true
 sync
 sleep 3
 
+cd "$old_dir"
+
 umount $DEVTMP
 
 rmdir $DEVTMP