modified public/progs.csv, modified public/thesiah.sh, modified static/progs.csv, modified static/thesiah.sh

4 files changed, 28 insertions, 18 deletions

diff --git a/public/progs.csv b/public/progs.csv
index d41d874..8e7dc4d 100644
--- a/public/progs.csv
+++ b/public/progs.csv
@@ -43,7 +43,6 @@ I,bluez,is a tool for bluetooth control command line.
 ,bluez-utils,is utils for bluetooth.
 A,brillo,controls the brightness of backlight and LED devices.
 ,btrfs-progs,is Btrfs filesystem utilities.
-P,cairosvg,is an SVG converter based on Cairo
 ,calcurse,is a terminal-based organizer for interactive and command line use.
 P,catboost,"is a fast, scalable, high performance gradient boosting on decision trees library."
 ,chafa,is a image-to-text converter.
@@ -85,12 +84,12 @@ A,htop-vim,is a graphical and colorful system monitor.
 ,imagemagick,is an image viewing/manipulation program.
 P,imageio,is a Python library that provides an easy interface to read and write a wide range of image data.
 P,imread,is a simple module with a small number of functions.
-,ipython,is an enhanced interactive Python shell.
+X,ipython,is an enhanced interactive Python shell.
 ,inputattach,is a set of utilities for joysticks and serial devices (especially tablet version ThinkPads).
 ,jq,is a command-line JSON processor.
 ,jre-openjdk,is an OpenJDK Java 23 full runtime environment.
-P,jupyter_client,contains the reference implementation of the Jupyter protocol.
-,jupytext,"is Jupyter notebooks as Markdown documents, Julia, Python or R scripts."
+X,jupyter_client,contains the reference implementation of the Jupyter protocol.
+X,jupytext,"is Jupyter notebooks as Markdown documents, Julia, Python or R scripts."
 P,kaleido,is a cross-platform library for generating static images.
 P,keras,"is a multi-backend deep learning framework, with support for JAX, TensorFlow, and PyTorch."
 A,lazydocker-bin,is a simple TUI for docker and docker-compose.
@@ -118,7 +117,6 @@ P,missingno,provides a small toolset of flexible and easy-to-use missing data vi
 ,mpc,is a terminal interface for mpd.
 ,mpd,is a lightweight music daemon.
 ,mpv,is the patrician's choice video player.
-A,mutt-wizard-git,is a light-weight terminal-based email system.
 ,ncmpcpp,is a ncurses interface for music with multiple formats and a powerful tag editor.
 ,neovim,is a tidier vim with some useful features.
 ,networkmanager-openvpn,is a VPN plugin for OpenVPN.
@@ -178,7 +176,7 @@ P,spicy,is a library for advanced Natural Language Processing in Python and Cyth
 P,sqlalchemy,is the Python SQL toolkit and Object Relational Mapper.
 ,sqlite,is a C library that implements an SQL database engine.
 P,statsmodels,is a Python package that provides a complement to scipy for statistical computations.
-A,stig-git,is a TUI and CLI client for the transmission daemon.
+X,stig,is a TUI and CLI client for the transmission daemon.
 ,tar,compresses or extracts files.
 ,task,is a command-line todo list manager.
 A,taskopen,is script for taking notes and open urls with taskwarrior.
@@ -203,7 +201,7 @@ I,ufw,is a tool for firewall.
 ,unrar,is an uncompression program for RAR.
 ,unzip,unzips zips.
 ,upower,abstracts for enumerating power devices especially for bluetooth devices.
-,urlscan,is an url selector for Mutt and termial.
+X,urlscan,is an url selector for Mutt and termial.
 A,urlview,enables to view url in a terminal.
 A,ventoy-bin,is a bootable USB tool.
 ,wireplumber,is the audio system.
@@ -217,7 +215,7 @@ P,xgboost,is an open-source software library which provides a regularizing gradi
 A,xmenu,is a menu utility for X.
 ,xwallpaper,sets the wallpaper.
 ,yarn,"is a fast, reliable, and secure dependency management."
-,yt-dlp,can download any YouTube video (or playlist or channel) when given the link.
+X,yt-dlp,can download any YouTube video (or playlist or channel) when given the link.
 ,zathura,is a pdf viewer with vim-like bindings.
 ,zathura-pdf-mupdf,allows mupdf pdf compatibility in zathura.
 A,zoom,is a video conferencing and web conferencing service.
diff --git a/public/thesiah.sh b/public/thesiah.sh
index 57d20e1..655af70 100755
--- a/public/thesiah.sh
+++ b/public/thesiah.sh
@@ -213,8 +213,14 @@ pipinstall() {
   whiptail --title "SI Installation" \
     --infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 9 70
   [ -x "$(command -v "pip")" ] || installpkg python-pip >/dev/null 2>&1
+  yes | pip install "$1" >/dev/null 2>&1
+}
+
+pipxinstall() {
+  whiptail --title "SI Installation" \
+    --infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 9 70
   [ -x "$(command -v "pipx")" ] || installpkg python-pipx >/dev/null 2>&1
-  yes | pip install "$1" >/dev/null 2>&1 || yes | pipx install "$1" >/dev/null 2>&1
+  yes | pipx install "$1" >/dev/null 2>&1
 }
 
 # runit
@@ -244,6 +250,7 @@ installationloop() {
       ;;
     "G") gitmakeinstall "$program" "$comment" ;;
     "P") pipinstall "$program" "$comment" ;;
+    "X") pipxinstall "$program" "$comment" ;;
     *) maininstall "$program" "$comment" ;;
     esac
   done </tmp/progs.csv
diff --git a/static/progs.csv b/static/progs.csv
index d41d874..8e7dc4d 100644
--- a/static/progs.csv
+++ b/static/progs.csv
@@ -43,7 +43,6 @@ I,bluez,is a tool for bluetooth control command line.
 ,bluez-utils,is utils for bluetooth.
 A,brillo,controls the brightness of backlight and LED devices.
 ,btrfs-progs,is Btrfs filesystem utilities.
-P,cairosvg,is an SVG converter based on Cairo
 ,calcurse,is a terminal-based organizer for interactive and command line use.
 P,catboost,"is a fast, scalable, high performance gradient boosting on decision trees library."
 ,chafa,is a image-to-text converter.
@@ -85,12 +84,12 @@ A,htop-vim,is a graphical and colorful system monitor.
 ,imagemagick,is an image viewing/manipulation program.
 P,imageio,is a Python library that provides an easy interface to read and write a wide range of image data.
 P,imread,is a simple module with a small number of functions.
-,ipython,is an enhanced interactive Python shell.
+X,ipython,is an enhanced interactive Python shell.
 ,inputattach,is a set of utilities for joysticks and serial devices (especially tablet version ThinkPads).
 ,jq,is a command-line JSON processor.
 ,jre-openjdk,is an OpenJDK Java 23 full runtime environment.
-P,jupyter_client,contains the reference implementation of the Jupyter protocol.
-,jupytext,"is Jupyter notebooks as Markdown documents, Julia, Python or R scripts."
+X,jupyter_client,contains the reference implementation of the Jupyter protocol.
+X,jupytext,"is Jupyter notebooks as Markdown documents, Julia, Python or R scripts."
 P,kaleido,is a cross-platform library for generating static images.
 P,keras,"is a multi-backend deep learning framework, with support for JAX, TensorFlow, and PyTorch."
 A,lazydocker-bin,is a simple TUI for docker and docker-compose.
@@ -118,7 +117,6 @@ P,missingno,provides a small toolset of flexible and easy-to-use missing data vi
 ,mpc,is a terminal interface for mpd.
 ,mpd,is a lightweight music daemon.
 ,mpv,is the patrician's choice video player.
-A,mutt-wizard-git,is a light-weight terminal-based email system.
 ,ncmpcpp,is a ncurses interface for music with multiple formats and a powerful tag editor.
 ,neovim,is a tidier vim with some useful features.
 ,networkmanager-openvpn,is a VPN plugin for OpenVPN.
@@ -178,7 +176,7 @@ P,spicy,is a library for advanced Natural Language Processing in Python and Cyth
 P,sqlalchemy,is the Python SQL toolkit and Object Relational Mapper.
 ,sqlite,is a C library that implements an SQL database engine.
 P,statsmodels,is a Python package that provides a complement to scipy for statistical computations.
-A,stig-git,is a TUI and CLI client for the transmission daemon.
+X,stig,is a TUI and CLI client for the transmission daemon.
 ,tar,compresses or extracts files.
 ,task,is a command-line todo list manager.
 A,taskopen,is script for taking notes and open urls with taskwarrior.
@@ -203,7 +201,7 @@ I,ufw,is a tool for firewall.
 ,unrar,is an uncompression program for RAR.
 ,unzip,unzips zips.
 ,upower,abstracts for enumerating power devices especially for bluetooth devices.
-,urlscan,is an url selector for Mutt and termial.
+X,urlscan,is an url selector for Mutt and termial.
 A,urlview,enables to view url in a terminal.
 A,ventoy-bin,is a bootable USB tool.
 ,wireplumber,is the audio system.
@@ -217,7 +215,7 @@ P,xgboost,is an open-source software library which provides a regularizing gradi
 A,xmenu,is a menu utility for X.
 ,xwallpaper,sets the wallpaper.
 ,yarn,"is a fast, reliable, and secure dependency management."
-,yt-dlp,can download any YouTube video (or playlist or channel) when given the link.
+X,yt-dlp,can download any YouTube video (or playlist or channel) when given the link.
 ,zathura,is a pdf viewer with vim-like bindings.
 ,zathura-pdf-mupdf,allows mupdf pdf compatibility in zathura.
 A,zoom,is a video conferencing and web conferencing service.
diff --git a/static/thesiah.sh b/static/thesiah.sh
index 57d20e1..655af70 100755
--- a/static/thesiah.sh
+++ b/static/thesiah.sh
@@ -213,8 +213,14 @@ pipinstall() {
   whiptail --title "SI Installation" \
     --infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 9 70
   [ -x "$(command -v "pip")" ] || installpkg python-pip >/dev/null 2>&1
+  yes | pip install "$1" >/dev/null 2>&1
+}
+
+pipxinstall() {
+  whiptail --title "SI Installation" \
+    --infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 9 70
   [ -x "$(command -v "pipx")" ] || installpkg python-pipx >/dev/null 2>&1
-  yes | pip install "$1" >/dev/null 2>&1 || yes | pipx install "$1" >/dev/null 2>&1
+  yes | pipx install "$1" >/dev/null 2>&1
 }
 
 # runit
@@ -244,6 +250,7 @@ installationloop() {
       ;;
     "G") gitmakeinstall "$program" "$comment" ;;
     "P") pipinstall "$program" "$comment" ;;
+    "X") pipxinstall "$program" "$comment" ;;
     *) maininstall "$program" "$comment" ;;
     esac
   done </tmp/progs.csv