[librsvg: 3/7] Don't copy twice please Also change cargo check to test, it should be test.




commit ca49160c7295c2f96f9d4ee27dbf61e269b28b38
Author: Madds H <madds hollandart io>
Date:   Mon Aug 23 20:01:34 2021 -0500

    Don't copy twice please
    Also change cargo check to test, it should be test.
    
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/579>

 tools/docker/build-librsvg.sh |  2 +-
 tools/docker/docker-test.sh   | 33 ++++++++++++++++++---------------
 2 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/tools/docker/build-librsvg.sh b/tools/docker/build-librsvg.sh
index b0a3d0f8..a5ce0fad 100755
--- a/tools/docker/build-librsvg.sh
+++ b/tools/docker/build-librsvg.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 cd /tmp/librsvg/
 sh /tmp/librsvg/autogen.sh
-cargo check
+cargo test
diff --git a/tools/docker/docker-test.sh b/tools/docker/docker-test.sh
index dfcb3aae..661f7abd 100755
--- a/tools/docker/docker-test.sh
+++ b/tools/docker/docker-test.sh
@@ -32,24 +32,27 @@ function prepare_librsvg {
 
        if [[ ! -f "$SYS/librsvg.tar.gz" ]]
        then
-               if [[ $INT == true ]]
+               if [[! $REPACKAGE == false]] 
                then
-                       read -p "Making a copy, then running make clean and packaging Librsvg, press any key 
to continue" -n1 -s
-               fi
+                       if [[ $INT == true ]]
+                       then
+                               read -p "Making a copy, then running make clean and packaging Librsvg, press 
any key to continue" -n1 -s
+                       fi
 
-               mkdir $TMPDIR
-               echo "Copying librsvg to $TMPDIR"
-               rsync -av --exclude '.git' --exclude 'target' $LIBDIR/ $TMPDIR/
-               #Uncomment this line if your distro doesn't have rsync, it'll make a lot of text when copying 
the git folder, but works
-               #cp -r $LIBDIR/. $TMPDIR 
-               cd $TMPDIR
+                       mkdir $TMPDIR
+                       echo "Copying librsvg to $TMPDIR"
+                       rsync -av --exclude '.git' --exclude 'target' $LIBDIR/ $TMPDIR/
+                       #Uncomment this line if your distro doesn't have rsync, it'll make a lot of text when 
copying the git folder, but works
+                       #cp -r $LIBDIR/. $TMPDIR 
+                       cd $TMPDIR
 
-               #Run autogen, this prepares librsvg for building, and allows make clean to be ran
-               ./autogen.sh
-               #run make clean which makes the resulting tar much smaller.
-               make clean
-               cd $DIR
-               tar -cvzf $SYS/librsvg.tar.gz -C $TMPDIR . --xform='s!^\./!!'
+                       #Run autogen, this prepares librsvg for building, and allows make clean to be ran
+                       ./autogen.sh
+                       #run make clean which makes the resulting tar much smaller.
+                       make clean
+                       cd $DIR
+                       tar -cvzf $SYS/librsvg.tar.gz -C $TMPDIR . --xform='s!^\./!!'
+               fi
        fi
 
        if [[ $REPACKAGE == true ]]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]