[bootlin/training-materials updates] master: Makefile: correct fix for double slash issue (1b386a56)

Thomas Petazzoni thomas.petazzoni at bootlin.com
Wed Oct 5 09:10:15 CEST 2022


Repository : https://github.com/bootlin/training-materials
On branch  : master
Link       : https://github.com/bootlin/training-materials/commit/1b386a5697bd1569fd31a1c3c1984e9a34a1133f

>---------------------------------------------------------------

commit 1b386a5697bd1569fd31a1c3c1984e9a34a1133f
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date:   Wed Oct 5 09:10:15 2022 +0200

    Makefile: correct fix for double slash issue
    
    Also need to re-add the slash in the setup lab.
    
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>


>---------------------------------------------------------------

1b386a5697bd1569fd31a1c3c1984e9a34a1133f
 Makefile             | 5 +----
 labs/setup/setup.tex | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9a6d5289..e1af10fc 100644
--- a/Makefile
+++ b/Makefile
@@ -306,12 +306,9 @@ $(OUTDIR)/%.pdf: %.pdf
 # === Misc targets ===
 #
 
-# Drop final / in the URL
-SESSION_URL := $(patsubst %/,%,$(SESSION_URL))
-
 $(VARS): FORCE
 	@mkdir -p $(dir $@)
-	/bin/echo "\def \sessionurl {$(SESSION_URL)}" > $@
+	/bin/echo "\def \sessionurl {$(patsubst %/,%,$(SESSION_URL))}" > $@
 	/bin/echo "\def \training {$(TRAINING)}" >> $@
 	/bin/echo "\def \trainer {$(TRAINER)}" >> $@
 
diff --git a/labs/setup/setup.tex b/labs/setup/setup.tex
index 54cf4e8e..709e2343 100644
--- a/labs/setup/setup.tex
+++ b/labs/setup/setup.tex
@@ -9,7 +9,7 @@ and more). Download and extract its tarball from a terminal:
 {\small
 \begin{bashinput}
 $ cd
-$ wget %\sessionurl%__SESSION_NAME__-labs.tar.xz
+$ wget %\sessionurl%/__SESSION_NAME__-labs.tar.xz
 $ tar xvf __SESSION_NAME__-labs.tar.xz
 \end{bashinput}
 }




More information about the training-materials-updates mailing list