From 3380d44f68dbce8577849a8b78aa52a92633a4cd Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <andrew@fsf.org>
Date: Tue, 1 Aug 2023 15:24:26 -0400
Subject: [PATCH] use sources .tar file, not .iso

trisquel 11 changed the sources archive format
---
 install-extras.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/install-extras.sh b/install-extras.sh
index 120ee6c..204a78a 100755
--- 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
 
 
@@ -144,7 +142,7 @@ wget 'https://media.libreplanet.org/mgoblin_media/media_entries/2332/grandsat094
 ### 
 
 
-cp -vr $ISOTMP/* $DEVTMP/source/ || true
+tar -C $DEVTMP/source/ -xvf $TAR
 
 
 ###
@@ -156,10 +154,8 @@ sync
 sleep 3
 
 umount $DEVTMP
-umount $ISOTMP
 
 rmdir $DEVTMP
-rmdir $ISOTMP
 
 sync
 
-- 
2.25.1