Merge branch 'dev' into rc
This commit is contained in:
+4
-3
@@ -121,12 +121,12 @@ show_webcam_select_menu() {
|
|||||||
local devices=$(get_webcam_list)
|
local devices=$(get_webcam_list)
|
||||||
local count=$(echo "$devices" | grep -c . 2>/dev/null || echo 0)
|
local count=$(echo "$devices" | grep -c . 2>/dev/null || echo 0)
|
||||||
|
|
||||||
if [[ -z $devices ]] || (( count == 0 )); then
|
if [[ -z $devices ]] || ((count == 0)); then
|
||||||
notify-send "No webcam devices found" -u critical -t 3000
|
notify-send "No webcam devices found" -u critical -t 3000
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( count == 1 )); then
|
if ((count == 1)); then
|
||||||
echo "$devices" | awk '{print $1}'
|
echo "$devices" | awk '{print $1}'
|
||||||
else
|
else
|
||||||
menu "Select Webcam" "$devices" | awk '{print $1}'
|
menu "Select Webcam" "$devices" | awk '{print $1}'
|
||||||
@@ -376,7 +376,8 @@ show_install_style_menu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_install_font_menu() {
|
show_install_font_menu() {
|
||||||
case $(menu "Install" " Meslo LG Mono\n Fira Code\n Victor Code\n Bistream Vera Mono\n Iosevka" "--width 350") in
|
case $(menu "Install" " Cascadia Mono\n Meslo LG Mono\n Fira Code\n Victor Code\n Bistream Vera Mono\n Iosevka" "--width 350") in
|
||||||
|
*Cascadia*) install_font "Cascadia Mono" "ttf-cascadia-mono-nerd" "CaskaydiaMono Nerd Font" ;;
|
||||||
*Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
|
*Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
|
||||||
*Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
|
*Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
|
||||||
*Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
|
*Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ fd
|
|||||||
ffmpegthumbnailer
|
ffmpegthumbnailer
|
||||||
fontconfig
|
fontconfig
|
||||||
fzf
|
fzf
|
||||||
ghostty
|
|
||||||
github-cli
|
github-cli
|
||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-keyring
|
gnome-keyring
|
||||||
@@ -86,7 +85,6 @@ gnome-disk-utility
|
|||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk
|
noto-fonts-cjk
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
noto-fonts-extra
|
|
||||||
nss-mdns
|
nss-mdns
|
||||||
nvim
|
nvim
|
||||||
obs-studio
|
obs-studio
|
||||||
@@ -123,7 +121,6 @@ tldr
|
|||||||
tree-sitter-cli
|
tree-sitter-cli
|
||||||
tmux
|
tmux
|
||||||
tobi-try
|
tobi-try
|
||||||
ttf-cascadia-mono-nerd
|
|
||||||
ttf-ia-writer
|
ttf-ia-writer
|
||||||
ttf-jetbrains-mono-nerd
|
ttf-jetbrains-mono-nerd
|
||||||
typora
|
typora
|
||||||
|
|||||||
Reference in New Issue
Block a user