diff --git a/CT-Build/Debian.yaml b/CT-Build/Debian.yaml index 0fd7c92..65ee064 100644 --- a/CT-Build/Debian.yaml +++ b/CT-Build/Debian.yaml @@ -1294,28 +1294,30 @@ packages: #Duplicati pkgs - packages: - unzip - - mono-runtime - - ca-certificates-mono - - libmono-2.0-1 - - libmono-system-configuration-install4.0-cil - - libmono-system-core4.0-cil - - libmono-system-configuration4.0-cil - - libmono-system-data4.0-cil - - libmono-system-drawing4.0-cil - - libmono-system-net4.0-cil - - libmono-system-net-http4.0-cil - - libmono-system-net-http-webrequest4.0-cil - - libmono-system-numerics4.0-cil - - libmono-system-runtime-serialization4.0-cil - - libmono-system-servicemodel4.0a-cil - - ibmono-system-servicemodel-discovery4.0-cil - - libmono-system-serviceprocess4.0-cil - - libmono-system-transactions4.0-cil - - libmono-system-web4.0-cil - - libmono-system-web-services4.0-cil - - libmono-system-xml4.0-cil - - libmono-microsoft-csharp4.0-cil - libsqlite3-0 + - mono-devel + ## netstandard.dll is newer versions of duplicatie and only incuded in mono-devel, wich satisfy all other mono dependencies,exept libmono-2.0-1 + #- mono-runtime + #- ca-certificates-mono + - libmono-2.0-1 + #- libmono-system-configuration-install4.0-cil + #- libmono-system-core4.0-cil + #- libmono-system-configuration4.0-cil + #- libmono-system-data4.0-cil + #- libmono-system-drawing4.0-cil + #- libmono-system-net4.0-cil + #- libmono-system-net-http4.0-cil + #- libmono-system-net-http-webrequest4.0-cil + #- libmono-system-numerics4.0-cil + #- libmono-system-runtime-serialization4.0-cil + #- libmono-system-servicemodel4.0a-cil + #- libmono-system-servicemodel-discovery4.0-cil + #- libmono-system-serviceprocess4.0-cil + #- libmono-system-transactions4.0-cil + #- libmono-system-web4.0-cil + #- libmono-system-web-services4.0-cil + #- libmono-system-xml4.0-cil + #- libmono-microsoft-csharp4.0-cil action: install variants: - duplicati @@ -1398,12 +1400,12 @@ packages: variants: - elkarbackupDEB -#Mono Repo - - name: mono.list - url: |- - deb [signed-by=/usr/share/keyrings/mono-archive-keyring.gpg arch=amd64] https://download.mono-project.com/repo/debian stable-buster main - variants: - - duplicati +##Mono Repo (Disabled, Debain repo version compatible) +# - name: mono.list +# url: |- +# deb [signed-by=/usr/share/keyrings/mono-archive-keyring.gpg arch=amd64] https://download.mono-project.com/repo/debian stable-buster main +# variants: +# - duplicati actions: - trigger: post-unpack @@ -1571,13 +1573,13 @@ actions: variants: - elkarbackupDEB -#Duplicati Repo key -- trigger: post-unpack - action: |- - #!/bin/sh - curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa6a19b38d3d831ef" | gpg --dearmor > /usr/share/keyrings/mono-archive-keyring.gpg - variants: - - duplicati +##Mono Repo key (Disabled since repo is not in use) +#- trigger: post-unpack +# action: |- +# #!/bin/sh +# curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa6a19b38d3d831ef" | gpg --dearmor > /usr/share/keyrings/mono-archive-keyring.gpg +# variants: +# - duplicati mappings: architecture_map: debian \ No newline at end of file diff --git a/Scripts/GetExternalResources.sh b/Scripts/GetExternalResources.sh index 504c2d5..e636fad 100644 --- a/Scripts/GetExternalResources.sh +++ b/Scripts/GetExternalResources.sh @@ -52,9 +52,9 @@ GetResource elkarbackupDEB rsnapshot.deb http://ftp.debian.org/debian/pool/main/ GetGithubRelease elkarbackupALP elkarbackup elkarbackup/elkarbackup Elkarbackup-installed GetResource elkarbackupALP elkb.tar.gz https://github.com/elkarbackup/elkarbackup/archive/refs/tags/$elkarbackupVer.tar.gz -o /tmp/ -##Duplicate get latest (non working version) -#duplicatiVer=$(curl -s https://api.github.com/repos/duplicati/duplicati/releases | grep 'tag_name.*' | grep 'beta' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |head -n 1) -##Duplicati get older version (Tested working) -duplicatiVer="v2.0.5.1-2.0.5.1_beta_2020-01-18" +##Duplicate get latest (Working with mono-devel ) +duplicatiVer=$(curl -s https://api.github.com/repos/duplicati/duplicati/releases | grep 'tag_name.*' | grep 'beta' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " " |head -n 1) +##Duplicati get older version (Working with only the runtime installed) +#duplicatiVer="v2.0.5.1-2.0.5.1_beta_2020-01-18" echo $duplicatiVer > "CT-Files/duplicati/duplicati-installed" GetResource duplicati duplicati.zip $(curl -s https://api.github.com/repos/duplicati/duplicati/releases/tags/"$duplicatiVer" | grep browser_download_url | grep .zip |grep -v signatures | sed -e s#^.*https#https# | tr -d \") \ No newline at end of file