Introduce bashpal to the project

New debian package (created by me)

.github/workflows/ruby.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
 
     - name: Install rspec
       run: gem install rspec -v 3.12.0

GUIDE.md

@@ -62,7 +62,6 @@ for example, `-c` and `-f`, to separate scripts into folders.
 4 -i -prv:  python and ruby version
 4 -i -r:    root (check if you are root or not)
 4 -i -s:    display computer space, uptime and number of processes running
-4 -o -a:    add alias
 4 -o -b:    print text in ASCII art (submodule)
 4 -o -cdp:  convert doc to pdf
 4 -o -def:  default web browser
@@ -106,9 +105,7 @@ tilux/sys/file_folder/fs.o
 ```
 
 If you prefer running specific scripts without launching Tilux itself,
-you can execute them individually as shown above. Additionally, if you frequently
-use certain scripts, you can add them to your alias for easier access.
-To do this, you can use the `sys/other/add_alias` script.
+you can execute them individually as shown above.
 
 ## Running with Docker
 

docs/source/guide.md

@@ -56,7 +56,6 @@ for example, `-c` and `-f`, to separate scripts into folders.
 4 -i -prv:  python and ruby version
 4 -i -r:    root (check if you are root or not)
 4 -i -s:    display computer space, uptime and number of processes running
-4 -o -a:    add alias
 4 -o -b:    print text in ASCII art (submodule)
 4 -o -cdp:  convert doc to pdf
 4 -o -def:  default web browser
@@ -100,9 +99,7 @@ tilux/sys/file_folder/fs.o
 ```
 
 If you prefer running specific scripts without launching Tilux itself,
-you can execute them individually as shown above. Additionally, if you frequently
-use certain scripts, you can add them to your alias for easier access.
-To do this, you can use the `sys/other/add_alias` script.
+you can execute them individually as shown above.
 
 ## Running with Docker
 

download/download_scripts

@@ -13,7 +13,6 @@ scripts=(
   "sys/info/bit.sh"
   "sys/info/ip.rb"
   "sys/info/root.rb"
-  "sys/other/add_alias.sh"
   "sys/other/parse_date.rb"
 )
 

man/tilux.1

@@ -152,9 +152,6 @@ root (check if you are root or not).
 .BR 4 " " -i " " -s
 display computer space, uptime and number of processes running.
 .TP
-.BR 4 " " -o " " -a
-add alias.
-.TP
 .BR 4 " " -o " " -b
 print text in ASCII art (submodule).
 .TP

scripts/add_alias

@@ -2,12 +2,16 @@
 
 [ ! -d scripts ] && cd ..
 
-source scripts/utils/bash_aliases
+source scripts/utils/bashpal_suggestion
 
 alias_name="tilux"
-check_alias_exists $alias_name
+cmd="cd $PWD && ./$alias_name"
 
-echo "alias $alias_name='cd $PWD && ./$alias_name'" >> $bash_aliases_file
-echo -e "Added ${alias_name} to ${bash_aliases_file}"
-
-prompt_for_new_shell_session
+if ! command -v bashpal &>/dev/null; then
+  bashpal_suggestion
+  bash_aliases_file=~/.bash_aliases
+  echo "alias $alias_name='$cmd'" >> $bash_aliases_file
+  echo -e "Added ${alias_name} to ${bash_aliases_file}"
+else
+  bashpal -a $alias_name -c "$cmd"
+fi

scripts/add_alias_venv

@@ -2,12 +2,16 @@
 
 [ ! -d scripts ] && cd ..
 
-source scripts/utils/bash_aliases
+source scripts/utils/bashpal_suggestion
 
 alias_name="tvenv"
-check_alias_exists $alias_name
+cmd=". $PWD/venv/bin/activate"
 
-echo "alias $alias_name='. $PWD/venv/bin/activate'" >> $bash_aliases_file
-echo -e "Added ${alias_name} to ${bash_aliases_file}"
-
-prompt_for_new_shell_session
+if ! command -v bashpal &>/dev/null; then
+  bashpal_suggestion
+  bash_aliases_file=~/.bash_aliases
+  echo "alias $alias_name='$cmd'" >> $bash_aliases_file
+  echo -e "Added ${alias_name} to ${bash_aliases_file}"
+else
+  bashpal -a $alias_name -c "$cmd"
+fi

scripts/add_project_to_path

@@ -2,16 +2,15 @@
 
 [ ! -d scripts ] && cd ..
 
-source scripts/utils/bash_aliases
+source scripts/utils/bashpal_suggestion
 
 directory=$PWD
 
-if grep -Fxq "export PATH=\$PATH:$directory" $bash_aliases_file || alias $directory &>/dev/null; then
-  echo "Directory or alias already exists in PATH!"
-  exit
+if ! command -v bashpal &>/dev/null; then
+  bashpal_suggestion
+  bash_aliases_file=~/.bash_aliases
+  echo "export PATH=\$PATH:$directory" >> $bash_aliases_file
+  echo "Added ${directory} PATH to ${bash_aliases_file}"
+else
+  bashpal -p $directory
 fi
-
-echo "export PATH=\$PATH:$directory" >> $bash_aliases_file
-echo "Added ${directory} PATH to ${bash_aliases_file}"
-
-prompt_for_new_shell_session

scripts/utils/bashpal_suggestion

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Seems redundant to add an util for bashpal suggestion
+# but I want to keep at least some support for alias and PATH
+# creation even if bashpal isn't installed.
+
+# Hence why I'm only reusing a small part of the original code.
+bashpal_suggestion() {
+  echo "Doesn't check for duplicates nor creates the file ~/.bash_aliases."
+  echo "I suggest installing bashpal."
+  echo -e "\nsudo add-apt-repository ppa:endormi/ppapp && sudo apt update && sudo apt install bashpal\n"
+
+  read -p "Do you want to continue? (Y/n) " continue
+  continue="$(echo ${continue} | tr 'A-Z' 'a-z')"
+
+  [ "$continue" != "y" ] && [ "$continue" != "yes" ] && echo "Exiting..." && exit
+}

tools/tilux/command_options.rb

@@ -81,7 +81,6 @@
       end
     },
     '-o': {
-      '-a':     -> { TiluxHelpers.sys("bash #{PATH}/sys/other/add_alias.sh tilux") },
       '-b':     lambda do
         system('clear')
         print `python3 -c "from tools.logos import Logo; Logo('Bashcii');"`

tools/tilux/print_options.rb

@@ -89,7 +89,6 @@ def systemin_print
 
 def systemo_print
   puts '::OTHER::'
-  puts '-a:   add alias'
   puts '-b:   print text in ASCII art (submodule)'
   puts '-cdp: convert doc to pdf'
   puts '-def: default web browser'
@@ -153,7 +152,6 @@ def help_print
   puts '4 -i -prv:  python and ruby version'
   puts '4 -i -r:    root (check if you are root or not)'
   puts '4 -i -s:    display computer space, uptime and number of processes running'
-  puts '4 -o -a:    add alias'
   puts '4 -o -b:    print text in ASCII art (submodule)'
   puts '4 -o -cdp:  convert doc to pdf'
   puts '4 -o -def:  default web browser'