Merge pull request #52 from AleixMT/dynamic_wrappers_#43

Dynamic wrappers #43

Author: AleixMT

data/core/common_data.sh

@@ -698,7 +698,8 @@ declare -r auxiliary_arguments=("-v" "-q" "-Q" "-s" "-o" "-e" "-i" "-d" "-c" "-C
 # multi-feature wrapper. #
 # Is preferable that the wrapper has the same installation privileges in all of its features. #
 ########################################################################################################################
-declare -r WRAPPERS_KEYNAMES=("programmingcore" "programmingide" "programmingpro" "texteditorcore" "mediacore" "systemcore" "internetcore" "artcore" "gamesinstall" "internetshortcuts" "standardinstall" "bashfunctions" "desktopfunctions" "terminalfunctions" "network" "networks" "fontsuser" "fontsroot" "custom1" "gitbashfunctions" "iochemroot" "iochemuser")
+# TODO: static wrapper deprecated for dynamic wrappers. Now we must move the static wrappers that we want to keep into tags
+# declare -r WRAPPERS_KEYNAMES=("programmingcore" "programmingide" "programmingpro" "texteditorcore" "mediacore" "systemcore" "internetcore" "artcore" "gamesinstall" "internetshortcuts" "standardinstall" "bashfunctions" "desktopfunctions" "terminalfunctions" "network" "networks" "fontsuser" "fontsroot" "custom1" "gitbashfunctions" "iochemroot" "iochemuser")
 # Thematic wrappers
 declare -r wrapper_programmingcore=("python3" "gcc" "jdk11" "git" "GNU_parallel")
 declare -r wrapper_programmingide=("android_studio" "sublime_text" "pycharm" "intellij_community" "visualstudiocode" "pypy3" "clion")

data/core/feature_arguments.sh

@@ -30,7 +30,6 @@ checkout_arguments=("checkout")
 cheese_arguments=("cheese")
 chess_arguments=("gnome_chess" "chess")
 chrome_arguments=("chrome" "google_chrome" "googlechrome")
-chrome_arguments=("google_chrome")
 clean_arguments=("clean")
 clementine_arguments=("clementine")
 clion_arguments=("clion")
@@ -51,7 +50,6 @@ customizerGUI_arguments=("customizer_gui" "gui")
 d_arguments=("d")
 dart_arguments=("dart")
 dbeaver_arguments=("dbeaver")
-dbeaver_arguments=("dbeaver")
 dconfEditor_arguments=("dconf_editor" "dconf")
 dia_arguments=("dia")
 discord_arguments=("discord")

data/features/clone/clone.dat.sh

@@ -1,6 +1,6 @@
 
 clone_name="Function clone"
-clone_description="Function for `git clone $1`"
+clone_description="Function for git clone  \$1"
 clone_version="1.0"
 clone_tags=("gitbashfunctions")
 clone_systemcategories=("System" "Utility")

data/features/duckduckgo/duckduckgo.dat.sh

@@ -1 +1,13 @@
-Private network search
+duckduckgo_name="Duckduckgo"
+duckduckgo_description="Duckduckgo opening in Browser"
+duckduckgo_version="Google dependent"
+duckduckgo_tags=("search" "internet_shortcuts")
+duckduckgo_systemcategories=("WebBrowser")
+duckduckgo_arguments=("duckduckgo")
+
+duckduckgo_bashfunctions=("silentFunction")
+duckduckgo_launcherkeynames=("default")
+duckduckgo_default_exec="xdg-open https://duckduckgo.com/"
+duckduckgo_description="Opens DuckDuckGo in Chrome"
+
+

data/features/duckduckgo/duckduckgo.md

@@ -1,11 +1 @@
-duckduckgo_name="Duckduckgo"
-duckduckgo_description="Duckduckgo opening in Browser"
-duckduckgo_version="Google dependent"
-duckduckgo_tags=("search" "internet_shortcuts")
-duckduckgo_systemcategories=("WebBrowser")
-duckduckgo_arguments=("duckduckgo")
-
-duckduckgo_bashfunctions=("silentFunction")
-duckduckgo_launcherkeynames=("default")
-duckduckgo_default_exec="xdg-open https://duckduckgo.com/"
-duckduckgo_description="Opens DuckDuckGo in Chrome"
+Private network search

data/features/go/go.dat.sh

@@ -3,7 +3,7 @@ go_name="go language"
 go_description="google programming language"
 go_version="1.17.linux-amd64"
 go_systemcategories=("Languages")
-go_tags=("search" "internet_shortcuts")
+go_tags=("search")
 go_downloadkeys=("bundle")
 go_bundle_URL="https://golang.org/dl/go1.17.linux-amd64.tar.gz"
 go_bundle_downloadPath="/usr/local"

data/features/lolcat/lolcat.dat.sh

@@ -1,6 +1,6 @@
 
 lolcat_name="Function lolcat"
-lolcat_description="Same as the command `cat` but outputting the text in rainbow color and concatenate string"
+lolcat_description="Same as the command cat but outputting the text in rainbow color and concatenate string"
 lolcat_version="System dependent"
 lolcat_tags=("terminal" "system")
 lolcat_systemcategories=("System" "Utility")

data/features/nedit/nedit.dat.sh

@@ -1,5 +1,5 @@
 
-nedit_name="NEdit "Nirvana Text Editor""
+nedit_name="NEdit Nirvana Text Editor"
 nedit_description="Text Editor"
 nedit_version="System dependent"
 nedit_tags=("editor" "Customizable" "Scripts" "Powerful")

data/features/templates/templates.dat.sh

@@ -1,6 +1,6 @@
 
 templates_name="Templates"
-templates_description="Different collection of templates for starting code projects: Python3 script (`.py`), Bash script (`.sh`), LaTeX document (`.tex`), C script (`.c`), C header script (`.h`), makefile example (`makefile`) and empty text file (`.txt`)"
+templates_description="Different collection of templates for starting code projects: Python3 script (.py), Bash script (.sh), LaTeX document (.tex), C script (.c), C header script (.h), makefile example (makefile) and empty text file (.txt)"
 templates_version="1.0"
 templates_tags=("bashfunctions" "terminal")
 templates_systemcategories=("System" "Utility")

src/core/functions_common.sh

@@ -237,42 +237,60 @@ append_text()
 # - Arguments: Reads the tags property of each feature and maps that feature to a wrapper with the name of each tag.
 generate_wrappers()
 {
- declare -Ag wrapper_dict
+ declare -Ag WRAPPERS_KEYNAMES
  for feature_name in "${feature_keynames[@]}"; do
  load_feature_properties "${feature_name}"
+
+ # Use tags to fill wrappers dictionary
  tags_pointer="${feature_name}_tags[@]"
- for tag in "${!tags_pointer}"; do
- if [[ -v wrapper_dict["${tag}"] ]]; then
- wrapper_dict[$tag]+=" ${feature_name}"
+ for tag in ${!tags_pointer}; do
+ if [[ -v WRAPPERS_KEYNAMES["${tag}"] ]]; then
+ WRAPPERS_KEYNAMES[$tag]+=" ${feature_name}"
+ else
+ WRAPPERS_KEYNAMES[$tag]="${feature_name}"
+ fi
+ done
+
+ # Use system categories to fill wrappers dictionary
+ categories_pointer="${feature_name}_systemcategories[@]"
+ for category in ${!categories_pointer}; do
+ if [[ -v WRAPPERS_KEYNAMES["${category}"] ]]; then
+ WRAPPERS_KEYNAMES[${category}]+=" ${feature_name}"
  else
- wrapper_dict[$tag]="${feature_name}"
+ WRAPPERS_KEYNAMES[${category}]="${feature_name}"
  fi
  done
  done
+}
 
- for key in $(echo "${!wrapper_dict[@]}" | tr ' ' $'\n' | sort -h); do
- echo "Tag: ${key} --- Feature: ${wrapper_dict[$key]}"
+
+# - Description: Prints the list that contains the list of included programs for each wrapper.
+# - Permissions: Can be executed indifferently as root or user.
+display_wrappers()
+{
+ for key in $(echo "${!WRAPPERS_KEYNAMES[@]}" | tr ' ' $'\n' | sort -h); do
+ echo "Tag: ${key} --- Feature: ${WRAPPERS_KEYNAMES[$key]}"
  done
 }
 
-# - Description: Generate the list that contains the list of included programs for each wrapper.
+
+# - Description: Load properties from a feature received in the first argument as a keyname
 # - Permissions: Can be executed indifferently as root or user.
-# - Argument 1: Keyname of the properties to import
 load_feature_properties()
 {
  # Load metadata of the feature if its .dat file exists
- if [ -f "${CUSTOMIZER_PROJECT_FOLDER}/data/features/${CURRENT_INSTALLATION_KEYNAME}/${CURRENT_INSTALLATION_KEYNAME}.dat.sh" ]; then
- source "${CUSTOMIZER_PROJECT_FOLDER}/data/features/${CURRENT_INSTALLATION_KEYNAME}/${CURRENT_INSTALLATION_KEYNAME}.dat.sh"
+ if [ -f "${CUSTOMIZER_PROJECT_FOLDER}/data/features/$1/$1.dat.sh" ]; then
+ source "${CUSTOMIZER_PROJECT_FOLDER}/data/features/$1/$1.dat.sh"
 
  # If we find the property manual_content_available declared, we should import the function file too
- local -r manualContentPointer="${CURRENT_INSTALLATION_KEYNAME}_manualcontentavailable"
+ local -r manualContentPointer="$1_manualcontentavailable"
  if [ -n "${!manualContentPointer}" ]; then
- if [ -f "${CUSTOMIZER_PROJECT_FOLDER}/data/features/${CURRENT_INSTALLATION_KEYNAME}/${CURRENT_INSTALLATION_KEYNAME}.func.sh" ]; then
- source "${CUSTOMIZER_PROJECT_FOLDER}/data/features/${CURRENT_INSTALLATION_KEYNAME}/${CURRENT_INSTALLATION_KEYNAME}.func.sh"
+ if [ -f "${CUSTOMIZER_PROJECT_FOLDER}/data/features/$1/$1.func.sh" ]; then
+ source "${CUSTOMIZER_PROJECT_FOLDER}/data/features/$1/$1.func.sh"
  fi
  fi
  else
- output_proxy_executioner "Properties of $1 feature have not been loaded. The file ${CUSTOMIZER_PROJECT_FOLDER}/data/features/${CURRENT_INSTALLATION_KEYNAME}/${CURRENT_INSTALLATION_KEYNAME}.dat.sh does not exist" "ERROR"
+ output_proxy_executioner "Properties of $1 feature have not been loaded. The file ${CUSTOMIZER_PROJECT_FOLDER}/data/features/$1/$1.dat.sh does not exist" "ERROR"
  fi
 }
 
@@ -601,6 +619,12 @@ argument_processing()
  exit 0
  ;;
 
+ --show-wrappers)
+ generate_wrappers
+ display_wrappers
+ exit 0
+ ;;
+
  --debug)
  customizer_prompt
  ;;
@@ -664,13 +688,17 @@ argument_processing()
  fi
 
  # Indirect expand wrapper variable
- local wrapper_key=
- wrapper_key="$(echo "${key}" | tr "-" "_" | tr -d "_")"
- local set_of_features="wrapper_${wrapper_key}[*]"
- if [ -z "${!set_of_features}" ]; then
+ generate_wrappers # Fill WRAPPERS_KEYNAMES dictionary
+ local wrapper_key
+ wrapper_key="$(echo "${key}" | tr "-" "_")"
+ local set_of_features="${WRAPPERS_KEYNAMES[${wrapper_key}]}"
+ if [ -z "${set_of_features}" ]; then
+ # If there are no wrappers corresponding with this key, the last possibility is that the key is actually a
+ # feature keyname, which we try to add to installation.
  add_program "${key}"
  else
- add_programs ${!set_of_features}
+ # There is a wrapper corresponding with this key, so we add each program that is in the wrapper.
+ add_programs ${set_of_features}
  fi
  ;;
  esac