From 855816f05b6cbd66072c5d904640d75005c96aa0 Mon Sep 17 00:00:00 2001 From: Bob Mottram <bob@freedombone.net> Date: Mon, 14 May 2018 19:52:04 +0100 Subject: [PATCH] Template option to install snap packages --- man/freedombone-template.1.gz | Bin 1428 -> 1437 bytes src/freedombone-template | 15 +++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/man/freedombone-template.1.gz b/man/freedombone-template.1.gz index 511a41b7c31736ee157dec496527c306110bab46..6413e39b1d730741c67dad3e8a2b49babf5f761a 100644 GIT binary patch delta 1390 zcmV-!1(Euc3!MvpABzY82io~s00Z4vZExE)5dQ98aqyRZsqLiefT0+QIceGiSW?4I zunp-DP~u7EB9SUd#nsRszdKTr?bLA!^aaHXCzdGQ+jGwy&mLc%LS_-ADHEe{<gu&@ z;SmmDc=#O7MFY<c4u2WKklwG?8{x{Ked1_?u0=5%491IpQy5-M&rgPfo%-I5;0<cD zbnQUn3S4Sc<)Pc)ATt(3Rk=Z{Z1LB{+u7o5@qoh7h&IEu7A5`-BZO-#g(~RM!nMW9 zKyCRhh3nLmrSfz=s*Lp{QkMzZ?p|q+R*PbDT^mUX8+0GF>F$HIN~E_U$JXe`Xl3-~ z#%ft@-b#Ug<<<rX*QKyZ$mC;XoX;(~_r*urlN*@?2}SNJ?Yt-opc_oRu?;_2VX{~C zsP)akwZudT4ebK3w~lu>Eh>7<ANL-1n7=w%9M8{YmuGJ;hJ(wca^M<AkVEZAu>gl2 zOxEVk!D^|}B}nA^1OWxzF-|Mx=>jrNvlm(lE7iY$C?TtL>KU?NbqtqF>~*E&G3iiR zc}2lDkhgS^WL)VSJiEiWB!$3#eu)|~RTQ+v)V{T<8!}_*nS~Zd5ll+-#1A(f#JHqE zr=NI8Ei#(~(5Gxh-i&g?F+2?>8dH;6O2r-81`2hH<d`Nlf;W)X&YO|~V^2ul)rDtA zV?^VBp2wHd`73(E>#K`nMwS?T(jnDW!BP;?ro<ku9xC^O)Ev#bSZ*TW*D(a!#C*LK z?Klcq;>aCt$;727Mh>(a3zO&M`i;?Bn|*Dy3y`)OpjX{XWZ4c8TJ1%+uKiMMSQAp- z5TR@*IF*vg#Y>Fqwrgz+oBQW&46R6JO?gj$s6#6hw;&+bC`{dL>^0O;7&cxFxi*0_ zYnrg0bSZR>H<fU1WvuLU9EaryV)rceFUZN14u19ir$%QguPv_q&-+$*i%r}5bfg^t zz&b#A(#DNaNz`8XrgN#+wj;QZf*eCRg}MmX45!4j1$t(u8&VE~<5O8uu{lqEkojYO zqrEi+%!I}wlE1A;iY3xL1WoZ;GDVgN|IFX7GHMQ8CLlP|mpomYimya5hO;b`mNZ;~ zeLZ!NG2^J(i90(igsNv@b}y16wuau)CLh+t$k^3YZiVd8nxQ4+%gFHdnG2yak()}T zp%K|y!wT`X=u(hS@2snv!qD?ib+wNcH=y9)1Y9kSKw3&xPYh}wl*TPJ^SG0T14Dna zL$i2aOwRc{e02nTzHOWxsi~_1*?sz$F{Zihgx&lm|tp|Xc%6H0st@7@K;ov)44 zbC{Zy6Wr_*=ZcZUyGKMH8a?(3ZI2~1HPAWE<3T$ez{|bj&Zd)11SsrL+0cKEbTD`w z@V=m-<sY}kbQ^BYXd)bbBRszxlrVpT-9u%63VC*#pid_~6ze&O6@3LvXVjOBUSm4z zhqxaePzmdavjuCP?Dqwd$2V@m9f(iEpjT_^z+t3H&{GGF=T_@TI{}8i5nB--Y+=Gb zeD>4xA2kiTSo#R9*TCQV#=>!ag=9ROhIYVT=Yo8QUrOj$<Q(uc;8j`|!bX4S{nDB` zUxv(Nv~xu#=>Iqs@bkgJ!I!0A`q>9#$OVs4n$Q<_6uL<Gh~!#;_*Il9Ybx+>bx3}b zlWsraF|62h9tBdz6R&z!tvj?f0l@G@Arwv~((llt`=1Q>bK_To&ppC+_TBxm941Bk zC{AHoJGy#9liC~uiIX~~Il)fTFbGTUEB9hD$qBnU8B^va)CiW_8YjxR8v7q=rdOAz wZ|B3okxAg(c$(Hq_%$)fZyO?GjsE3eoY=u1n7ruC+}knu4_yMf4UZB40G5rcy#N3J delta 1381 zcmV-r1)BPu3zQ3gABzY8ci8z_00Z4v+iu%N5PjEI4D^zhNV3xuD1suW>^QN3+7Toh zZQ%sQk~^ffCU=?LrBxRB_|EK-l;p^AfLsvNaAIC|ZfDM1r19k`WEN4HGBFxQ9?Pl_ z9^nv%htJ_$H1O=;@RuPB>G$>eAY3`LPaGZ4wJ3&z!FX|h3d4)(`N?pwQ{TH0yg`kY zt{rGxflIBbJah*fWX6K1DmQ4AE&jTAJ6oJB9#A+M(P6mOqQv(wLb%3KsDdsnTwAOR z)Rym3xK2%3Do@v=%2-b#b(x^;?v?gvwJ0{9Ya>ZvgYKg?-F>iDiS$<F*cu%ft&HA0 zSS_o~TPd)A+&UoPx)fFknS88_^SMR$q4-E=awC%<p~!uuofky`bc3lkw&6D`O!lfC zwZ1vHmY67^p?v`Ct$W|W`s!qHJU^RVp1r*o4lb9<fomM03bi9y0S-NwtWA%D)l#KP zkjVE50t&igC|1hT1!SB_FSHa^s((>JR_oL=D#7Z17%rFC>q^Nf(xJ5SisEY^Zy6!U zxY9Xzc8AkN3W5LmC2Gi2QP2@n`_`&%$c&|T7Fwu8Fe%X!1>ATL<B|rQe&Qju$b=C< ze`PcBW|SL_;b}0@n3~iQ+IMIhDAX;IW10vD-auMAZ%PV`Jt28l7oHuB5siDQUQXw) z=oempUtJtCvP9aG4yl&tOF>AR5_`CMsN4%ub2RT_xrv-!#}I52x%F1G<0xc_26wn6 z6CXt}a-cm}m^>%fZ;akL>}#uCfV4dTz3N^f%XWy+(_Vy2*Du9}H6i5<5z2OgQz@BT z{D^VgcCC$J^ZdMxp%uxjDenn&XodO}1mqfjg{ixZ?Sz^J!^TfTu1(;~nkK9#T?(D! zO(mRL87n&-$Ki1Vv3nO=6y#(|2fup%Q=>DL*B00Q=Y6-k#is3UI?|2+U>%@5Y2#j~ zBx<jG)49}Z+YwwyL5`uELR|!GhErnN0zI?S4Jn7g@u@7S*qkRn$o#R<-kJhtLSqqs z$=_Ba#S-Zrf~I&anIg-Cf9CI388wG46A+x~OP;Px#aE&j!&w$eOByc0zMi_sm~m9? z#GM@$Le;Y{yBEn3TSISYlMm}+WbEoHw?g)4&Cn9^Wn_5!&V|sK$W5iv(1>iUVTE{G zbSX%vch=QSVd(v*y4u$pP;hVpt`<iQAT1@UCkC|-O5>KAd3=+P14Do7L9_T!OwM`a zy*dIOVH>j}HFZ@WyN~}6MZ0;$?GWhaGp7D1RQ9lJLWvLI-Mb*U^Jil~4pXyof}4Hf zTrrY(_lW32+r?g??ahN00~*!50kjJMyxc49Y&zLQfWjV?4gJrN4hF9S-WRl&{O#75 zZo|zPO@za5gy)xo64rmLd#LPBA+JXh^y#FBV!aBnqOXAIjQWz%YfNYTp7z57Dq+1; zwqWg({k}l*`o>MT1Mz8C^lD8VIIL6&dg{P&ZnciI8(`=gu@&)P3rqarv!9;-sA<^6 z(nn~$2L9fM5{~mLB;(;Uv<v<^7vw|y+(BcJbHLkxS7}`c8=-&qOKa+U88Va6$rVk| z|8Xkd=YxZTFH6Dnvj=0y1+P(>&=+?Ux=46LaxFmov`L#a75KLrlHX*~?MFO@6`RhZ zK<YU0s%O=@Lu(TN3?CFi;bbEH4n4a6R)GI*d@=C3BW!2i-7m{wQnZia6t=aat2eZ% z%`uQTsdL&BJS|Owu=KuiFD8?mu&a|XWo|-^V7aYvqMWO-|1M^Fb$R-BJ{%mG1kR18 nZLNe~6O;V5Au`tJUk=8J9sGgGi{8w=6NCQ%#yxJ0auNUlDNCw& diff --git a/src/freedombone-template b/src/freedombone-template index d3673196f..4fb894b37 100755 --- a/src/freedombone-template +++ b/src/freedombone-template @@ -48,6 +48,7 @@ your_email='' SHOW_ON_ABOUT=1 database_type='' debian_packages= +snap_packages= function show_help { echo '' @@ -69,6 +70,7 @@ function show_help { echo $' -o --onion [yes|no] Is this app only available on an onion address?' echo $' -p --php [yes|no] Is this a PHP app?' echo $' --packages [list of deb package names] Debian packages to be installed' + echo $' --snaps [list of snap package names] Snap packages to be installed' echo $' -s --daemon [yes|no] Add a daemon' echo $' -d --database [mariadb|postgresql|mongodb] Type of database' echo $' -w --web [yes|no] Whether there is a web user interface (default is yes)' @@ -158,6 +160,10 @@ do shift debian_packages="$1" ;; + --snaps|--snap) + shift + snap_packages="$1" + ;; *) # unknown option ;; @@ -716,6 +722,10 @@ if [ $app_webui ]; then echo '' echo " remove_ddns_domain \"\$${app_name_upper}_DOMAIN_NAME\"" fi +if [ "$snap_packages" ]; then + echo '' + echo " snap remove ${snap_packages}" +fi echo '}' echo '' echo "function install_${app_name} {" @@ -723,6 +733,11 @@ if [ "$debian_packages" ]; then echo " apt-get -qy install ${debian_packages}" echo '' fi +if [ "$snap_packages" ]; then + echo ' apt-get -qy install snapd' + echo " snap install ${snap_packages}" + echo '' +fi if [[ "$database_type" == "mariadb" || "$database_type" == "mysql" ]]; then echo ' install_mariadb' echo '' -- GitLab