Skip to content

Commit 89cf09b

Browse files
author
olevole
committed
mark downloaded images
1 parent dc9a1fe commit 89cf09b

File tree

2 files changed

+28
-18
lines changed

2 files changed

+28
-18
lines changed

‎etc/defaults/vm-linux-Tails-6.conf

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ vm_profile="Tails-6"
55
vm_os_type="linux"
66

77
# this is one-string additional info strings in dialogue menu
8-
long_description="Tails: 6.10"
8+
long_description="Tails: 6.11"
99

1010
# custom settings:
1111
fetch=1
@@ -14,21 +14,21 @@ fetch=1
1414
# + mirrors: https://gitlab.tails.boum.org/tails/mirror-pool ( mirrors.json )
1515
# DEV
1616
iso_site="\
17-
https://download.tails.net/tails/stable/tails-amd64-6.10/ \
18-
https://mirrors.edge.kernel.org/tails/stable/tails-amd64-6.10/ \
19-
https://tails.ybti.net/tails/stable/tails-amd64-6.10/ \
20-
https://chuangtzu.ftp.acc.umu.se/tails/stable/tails-amd64-6.10/ \
21-
https://mirrors.wikimedia.org/tails/stable/tails-amd64-6.10/ \
22-
https://tails.osuosl.org/stable/tails-amd64-6.10/ \
23-
https://mirror.jason-m.net/tails/stable/tails-amd64-6.10/ \
24-
https://iso-history.tails.boum.org/tails-amd64-6.10/ \
17+
https://download.tails.net/tails/stable/tails-amd64-6.11/ \
18+
https://mirrors.edge.kernel.org/tails/stable/tails-amd64-6.11/ \
19+
https://tails.ybti.net/tails/stable/tails-amd64-6.11/ \
20+
https://chuangtzu.ftp.acc.umu.se/tails/stable/tails-amd64-6.11/ \
21+
https://mirrors.wikimedia.org/tails/stable/tails-amd64-6.11/ \
22+
https://tails.osuosl.org/stable/tails-amd64-6.11/ \
23+
https://mirror.jason-m.net/tails/stable/tails-amd64-6.11/ \
24+
https://iso-history.tails.boum.org/tails-amd64-6.11/ \
2525
"
2626

2727
# Official CBSD project mirrors ( info: https://github.com/cbsd/mirrors )
2828
cbsd_iso_mirrors="https://mirror.convectix.com/iso/ https://raw.githubusercontent.com/cbsd/mirrors/refs/heads/main/cbsd-iso.txt"
2929

3030
#DEV
31-
iso_img="tails-amd64-6.10.img"
31+
iso_img="tails-amd64-6.11.img"
3232

3333
# copy ISO as hard drive
3434
iso2img="1"
@@ -55,8 +55,8 @@ qemu_active=1
5555

5656
# Available in ClonOS?
5757
clonos_active=0
58-
sha256sum="46ff2ce0f3b9d3e64df95c4371601a70c78c1bc4e2977741419593ce14a810a7"
59-
iso_img_dist_size="1581252608"
58+
sha256sum="230dcd717faaf225d5a738e72fcacdfad6aca05064a2069d85f2ef2e77e5c9f5"
59+
iso_img_dist_size="1589641216"
6060

6161
# enable birtio RNG interface?
6262
virtio_rnd="1"

‎subr/settings-tui-virtual.subr

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,15 +1195,15 @@ get_construct_vm_os_profile()
11951195
_cloud_list=$( ${MKTEMP_CMD} )
11961196

11971197
trap "${RM_CMD} -f ${_classic_list} ${_cloud_list}" HUP INT ABRT BUS TERM EXIT
1198-
env NOCOLOR=1 show_profile_list search_profile=${_search_profile} show_cloud=0 show_${emulator}=1 uniq=1 display=path,name,contrib header=0 arch_only=${arch} > ${_classic_list}
1199-
env NOCOLOR=1 show_profile_list search_profile=${_search_cloud_profile} show_cloud=1 show_${emulator}=1 uniq=1 display=path,name,contrib header=0 arch_only=${arch} > ${_cloud_list}
1198+
env NOCOLOR=1 show_profile_list search_profile=${_search_profile} show_cloud=0 show_${emulator}=1 uniq=1 display=path,name,contrib,imginit header=0 arch_only=${arch} > ${_classic_list}
1199+
env NOCOLOR=1 show_profile_list search_profile=${_search_cloud_profile} show_cloud=1 show_${emulator}=1 uniq=1 display=path,name,contrib,imginit header=0 arch_only=${arch} > ${_cloud_list}
12001200

12011201
_classic_cnt=$( ${WC_CMD} ${_classic_list} | ${AWK_CMD} '{printf $1}' )
12021202
_cloud_cnt=$( ${WC_CMD} ${_cloud_list} | ${AWK_CMD} '{printf $1}' )
12031203

12041204
menu_list="${menu_list} '>' ' -- Classic images [${_classic_cnt}] -- ' ''"
12051205

1206-
eval $( ${CAT_CMD} ${_classic_list} | while read path vm_profile contrib; do
1206+
eval $( ${CAT_CMD} ${_classic_list} | while read path vm_profile contrib imginit; do
12071207
unset long_description iso_img_dist_size
12081208
eval $( ${GREP_CMD} ^long_description= ${path} )
12091209
eval $( ${GREP_CMD} ^iso_img_dist_size= ${path} )
@@ -1217,7 +1217,12 @@ get_construct_vm_os_profile()
12171217
fi
12181218
[ "${contrib}" = "1" ] && long_description="[contrib] ${long_description}"
12191219
_mypath=$( echo ${path} | ${SED_CMD} s:^${workdir}/::g )
1220-
menu_list="${menu_list} '${vm_profile}' '${_mypath}' '${long_description}, size: ${iso_img_dist_size}'"
1220+
# ↯ - downloaded ( echo $'\U21AF' )
1221+
if [ "${imginit}" = "1" ]; then
1222+
menu_list="${menu_list} '${vm_profile}' '${_mypath} (↯)' '${long_description}, size: ${iso_img_dist_size}, (↯) - image already downloaded/cached'"
1223+
else
1224+
menu_list="${menu_list} '${vm_profile}' '${_mypath}' '${long_description}, size: ${iso_img_dist_size}'"
1225+
fi
12211226
echo "menu_list=\"${menu_list}\""
12221227
# store filename
12231228
echo "profile${_all}=\"${vm_profile}\""
@@ -1226,7 +1231,7 @@ get_construct_vm_os_profile()
12261231
echo "_all=${_all}"
12271232
done )
12281233

1229-
eval $( ${CAT_CMD} ${_cloud_list} | while read path vm_profile contrib; do
1234+
eval $( ${CAT_CMD} ${_cloud_list} | while read path vm_profile contrib imginit; do
12301235
unset long_description iso_img_dist_size
12311236
# when -n $1 we apply profile, so skip unnecessary vars
12321237
eval $( ${GREP_CMD} ^long_description= ${path} )
@@ -1241,7 +1246,12 @@ get_construct_vm_os_profile()
12411246
fi
12421247
[ "${contrib}" = "1" ] && long_description="[contrib] ${long_description}"
12431248
_mypath=$( echo ${path} | ${SED_CMD} s:^${workdir}/::g )
1244-
cloud_menu_list="${cloud_menu_list} '${vm_profile}' '${_mypath}' '${long_description}, size: ${iso_img_dist_size}'"
1249+
# ↯ - downloaded ( echo $'\U21AF' )
1250+
if [ "${imginit}" = "1" ]; then
1251+
cloud_menu_list="${cloud_menu_list} '${vm_profile}' '${_mypath} (↯)' '${long_description}, size: ${iso_img_dist_size}, (↯) - image already downloaded/cached'"
1252+
else
1253+
cloud_menu_list="${cloud_menu_list} '${vm_profile}' '${_mypath}' '${long_description}, size: ${iso_img_dist_size}'"
1254+
fi
12451255
echo "cloud_menu_list=\"${cloud_menu_list}\""
12461256
# store filename
12471257
echo "profile${_all}=\"${vm_profile}\""

0 commit comments

Comments
 (0)