From 5b21c3dc49509f76d935faca2c821d987252ab82 Mon Sep 17 00:00:00 2001 From: Thomas Briffard Date: Thu, 1 Jul 2021 20:36:31 +0200 Subject: [PATCH] quelques corrections --- docker-compose.yml | 2 +- kdiff3/kdiff3.png | Bin 819 -> 3060 bytes qtcreator/Dockerfile_centos7_qtcreator | 2 +- template.sh | 17 ----------------- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0ed9e13..12270d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -118,6 +118,6 @@ services: - ./.env environment: - CUSTOM_STEP_PRE_DEPLOY=/build/kdiff3_pre_step.sh - - NOM_APPIMAGE=kdiff3_1.9.2 + - NOM_APPIMAGE=kdiff_3_1.9.2 command : ["bash", "-c","/template.sh /usr/local/bin/kdiff3 /build"] diff --git a/kdiff3/kdiff3.png b/kdiff3/kdiff3.png index 4816fdd303f09c6ac0ff994891dbe44eadfbe3d9..ab229d6f04182e6acdd0fbd15757d08b71d2592d 100644 GIT binary patch literal 3060 zcmai0dpy(M|6lS+=_BeBa+yN)DN-z#%%w(}5o>ZOg;pv|#1*wzd3!2LJ$DK8>KpEu*HU*4fz!3IXlhxsyyLi;IiL z#Kf$utk~PzA2@JedV0FDvT|c%%zIv0SF62Q|FkdWv&*)cRU zWNd7_xw*MMy^h6VS(dEf;b8*<0}_cu|3+7cRTw9aj|7ci8QA3HWF;k~y1F_^Nl6-w zcJSaqF)^`-hzJ!G6@P#K+1Xh)H#bK|$EBquFE1}wS63#JdFITS_V)JU$B#EQHu88p zfKK=D@BkDP3JVK+dU{H>!oXq$0)d2t#KOWtK|w)6LV}f*m8q%e;^N}q;NbZ9IETZ5 z!{OT6+KGvYC=^OVLxVlb20A-KLPCHOCtBrN=jZ2V>Sp@;`xy*|lamt+1~Yta`2PL- zl$4asRpH9;3eeE-^5shl3yZb2HDF@m$B!RhzkaPBt}iby2j=JJ=H`H*p&r8?z}6Np zGWw4B{`uzThK7b)w{8KZra(~8qeqYQ_4VaQa)6wikiW6^YmLw1Pc2W4#f<^ao)HLy zfPesCadEP25*Qe0<+K9R(*TF_bM7a=U;vesKt@JrV<-?9h$=#9WopgV&+;g|)Q;5T zkI92?6DPKM`6tfC`YPzac%|tdb$=L{WcROaD-3Dz>j=!M2PldPf4zph!d?QIUQ`7gyF5MFw!^qIAX1WUy=B(#ZEm zTW8nBHd>=(dk8tEyOkrPO#V;dYEo02PNj8N_x7YapGZ5Mo}KGbd?L*PCI;r`?dAjA z6+#zO+a}YwgzP=23dfg@W1Q6&CEf7948r$aSE77&+$DkMYc9g+<5iF^8R5=$Wu~8J zUAcN4ONGX!v@Q%~53YCnGLA^;QnoSS2oLFT9rKrclCfcvV_+8d-#vkv2a&yD?;bjO93gcMOsRc;rHH>kV*K>5~qq97^Y*qFyD%W3l5>xuo zq;EvKd~jEkPgm%^?L)-uW4+eWn*VTj88GhAE4Wwbeic7AxOOyXq5Sdd{CMw=RXiOT zw(cNIw<&i~^6Ses?HvDhU2)=Tf$|Nk?C)4{|N4+;sH4VSs$*H+A!gO_iI_EGFPYlR zj&4JDZWU;yKr5Nhs=W7ikTuaWBefsh2hIDc{jOt%MG?ry6#L~34;*b$_th^^#0!bV z!HuH?A199wRVC&CF_q;TO|89#nbhZ^i&E!N+r`24{=pw>(y%_yK1wj?zOgrvufeDa zFOYXSThZrx6MMtTD?c8YtsS*}UAe-%1kVUmiNIqO1*Fc!hA=JZ6wsxj{b z3+{gNFJ^|16yJ4he?H-YbxGlNM|x!9121gjz+`)`!s{X68FOaxPam|;F+n$)b{P)S z!Jqn~dbQ(-nPdPwQbUa?QKXa^rlnZ1)rBp{`z%#dvW0?3jUWrIF3PU#r}i0HnaBGT zl`{6iUIY@%DAHQ&erhFM{J)ZH^0^-A7KBlM_M5!Q<@_T!|5rBqwb+GkpP0)0S79(u z;oZ9HHkIj33Hj%H=R+Q=Sj`pv83MO>xJRuyy*mOz%6N3R>>f6FI%ifqW8^FpL+PU@JdO|0#da z|MTQ|vqLxX^Y0ASEa7*yzP~|^hdKf9bJng(MzAQ&)3wyxX4CFGtHOMkZ#W5&e`h(O zJm4s1cYOj|dO)Mi(~hqVuF!237I78W2I!4Ab>*>#dZn5>@TFslE{~Vq*P=nfRnfE% zBs%vziW8(Jz_*C(Ak60biSS2@%??*v=Qwu_|2@$B%5&l@v-Etk{x^OWxSK)UFk5*B zaq?>Xsi!BE^=zL$r;_(|BZAUGv*pF%M7jg=s`WzSKB25m#zh zh`v6CsN8+#oh1HvZkyq55y7jS z5DwNoGR`Lic=I9fn)*pp{tByn%%%62b5V*-{5>m*5uaPiwnS?$rbFGNM#_Wpk+Yxt zL2Y3`0JI+=F4IShyNvZos))G%ShbG2$ud!d`XyszG0ur9cuICIT&& zc`h$6$6qu!z1SDveXP(>cRHtjjThJedM&#_N*Q+a+&a(Rf;NQvnZyD!MwPpAI&P7?Os_Jjh3=M`=@p!J{c{RHtv`7er=_*jp4o z^F{l=-@}YD=co9DZciy$G_WG zYxt=XiEQ_YSPi40iGo|{)_7d`O+^={*Z#%h1*$kAEdKe!4{Z)@Yjp2<-tBz&lL4E| z@Wst4=uRg;pd*>{wU8O_Rnct!*pyq26_Z=o=aNa9_xRvj3TJiM6)*=z})D2i63U$l0`$MyyY)F5-NN3w+)~ zfBJ(1@s|RQ&gyZvM}vH|j|s1|$f)wJUGe9c@A-11retjFM;)#0RqiKVW0t^WIZ(-w zZx3?L^b9z zI;qb+pMar)f~2C`hf$PjVp`;$n8@s9^>A)M1;zuqWdhg94y(dJe z2Od3!r}fCo^1^Bnknk^ih2DuE^~Q5Koo!s#%iIL3#sa(9I&aYY1MicBUx~(yYKkAr zVJ5EhDP=D=5jxgPFNuPx#32;bRa{vGf6951U69E94oEQKA0@z7JK~!ko?V3$UR8bVie^b_?K%=BuL_{A{ zf<rJ5os+3f*^7hQ3)*~3#rH=D;K3D zWglkKVy-Ye?l|*i<~|*G2Ocx?zn}m6?)jhlF%cYC^nU$Dpxu&ms4EtKQOvf=aAR|U zEf&1I*bPmi#4RKc5-89jc_>U2h-S&Q9N2BaF9ZEq%HHgX#d}<;P!u?k=YZ|cAx|&R z6Z$|%ARx=f2W|szv*f7;j#}`Oz?&>(A3If{9F=MtaL1BV(-n(9Ddj0NTIxRVHzW|y za(Wc_X2E|GT7fFmyQz8}u)<-VUaflc?2F4OR0~{lNT3C{9xf$90#kS`H0F`Rh>!2N zsyga&3fVe63upzl0yRJtFaXp6w|rK&%PiT0As`~n zz!_jssW@?Z=MMl{YAQ6|`5nN8BJ|-OaK$YC#(sHEc<6zb20_5q$kPmYM}T)}kJm{P zp5JpsWTtBs`enf?GK}(FV95k^{j^~7$$o-e&>I-GU@P+!0~_%LuBXsPi}N+*BY{A@ z1^e!lfKi%+Wz>%NRI?UfwFe&Z8;SFc12-(#X%X3*iwuj%PP2UQTDPhuT{|&AC#j3< za?fB~6_LZ{RN;NvGYG5!Hj}!gsmf4qM_?No5oyS$!3nHGRT~4_)T?SIaJERDe+}%L zj8lm=;Cz8~B!F5~9iFs3v50IpPFd-r*a&b8IOo@Koownwq!MTX8c6-oqbx%ZyhrNx xCa$WVrrfE7AyZ+ZY|`ww#y>x+YEkb9{sSM$z0P1NW1#>5002ovPDHLkV1m)iWLN+I diff --git a/qtcreator/Dockerfile_centos7_qtcreator b/qtcreator/Dockerfile_centos7_qtcreator index 0bd72ef..d46eab4 100644 --- a/qtcreator/Dockerfile_centos7_qtcreator +++ b/qtcreator/Dockerfile_centos7_qtcreator @@ -7,7 +7,7 @@ RUN yum install -y patchelf && \ cd qt-creator && \ git checkout $QTCREATOR_VER && \ mkdir qtcreator_build && cd qtcreator_build && \ - QT_VER=$QT_VER cmake3 -DCMAKE_BUILD_TYPE=Release -G Ninja "-DCMAKE_PREFIX_PATH=/qt/$QT_VER/gcc_64/" /qt-creator/ && \ + cmake3 -DCMAKE_BUILD_TYPE=Release -G Ninja "-DCMAKE_PREFIX_PATH=/qt/$QT_VER/gcc_64/" /qt-creator/ && \ cmake3 --build . # Exécuter une commande au démarrage de l'image. diff --git a/template.sh b/template.sh index 16c2eb7..2787ba2 100755 --- a/template.sh +++ b/template.sh @@ -1,6 +1,4 @@ #!/bin/bash -# à utiliser pour builder une appimage d'une app quelconque, y compris hors cadre GIREF/BIB -# Ceci est un point départ plus qu'un script clef en main ! function exit_on_fail() { "$@" local status=$? @@ -11,19 +9,6 @@ function exit_on_fail() { return $status } -# Fonction permettant d'effectuer quelques vérifications de base -function verifications() { - echo "### Vérifications" - command -v linuxdeploy-x86_64.AppImage >/dev/null 2>&1 || { - echo >&2 "L'outil linuxdeploy-x86_64.AppImage n'est pas présent, pas de livraison possible !" - exit 1 - } - command -v appimagetool-x86_64.AppImage >/dev/null 2>&1 || { - echo >&2 "L'outil appimagetool-x86_64.AppImage n'est pas présent, pas de livraison possible !" - exit 1 - } -} - if [[ "$#" -ne 2 ]] && [[ "$#" -ne 3 ]]; then echo "Usage: $0 CHEMIN_COMPLET_VERS_APP/mon_app CHEMIN_DESTINATION_APPIMAGE" exit 0 @@ -33,8 +18,6 @@ script_dir=$(dirname $0) BIN=$1 DEST_DIR=$2 -verifications - APP_NOM=$(basename $BIN) if [[ -z NOM_APPIMAGE ]]; then if [[ "$APP_NOM" =~ "." ]]; then