commit 42ed562eb243b8418a01ce576a2585e293f695dc
parent cd213b1a3a6a8d16d36f433adbb767446d6b1c75
Author: finwo <finwo@pm.me>
Date: Sat, 2 Mar 2024 00:36:46 +0100
Fetching the package.ini location from the package cache in new structure
Diffstat:
| M | dist/dep | | | 105 | ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- |
| M | src/command/add/index.sh | | | 101 | ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- |
2 files changed, 130 insertions(+), 76 deletions(-)
diff --git a/dist/dep b/dist/dep
@@ -169,50 +169,50 @@ Arguments:
url The url pointing to the package.ini that describes the dependency.
EOF
-CMD_ADD_PKG=
-CMD_ADD_SRC=
+CMD_ADD_ARGS=
function arg_a {
arg_add "$@"
return $?
}
function arg_add {
-
- # Check if name exists in the repositories
- # Returns if found
- mkdir -p "${HOME}/.config/finwo/dep/repositories.d"
- while read repo; do
-
- # Trim whitespace
- repo=${repo##*( )}
- repo=${repo%%*( )}
-
- # Remove comments and empty lines
- if [[ "${repo:0:1}" == '#' ]] || [[ "${repo:0:1}" == ';' ]] || [[ "${#repo}" == 0 ]]; then
- continue
- fi
-
- while read line; do
- pkgname="${line%%=*}"
- pkgloc="${line##*=}"
- # If found, return it
- if [ "${pkgname}" == "$1" ]; then
- CMD_ADD_SRC="${pkgloc}"
- break 2
- fi
- done < <(curl --location --silent "${repo}")
- done < <(find "${HOME}/.config/finwo/dep/repositories.d" -type f -name '*.cnf' | xargs -n 1 -P 1 cat)
-
- # Need 2 arguments from here on out
- if [ -z "${CMD_ADD_SRC}" ] && [ $# != 2 ]; then
- echo "Add command requires 2 arguments" >&2
- exit 1
- fi
-
- CMD_ADD_PKG="$1"
- if [ -z "${CMD_ADD_SRC}" ]; then
- CMD_ADD_SRC="$2"
- fi
+ CMD_ADD_ARGS=("$@")
+
+ # # Check if name exists in the repositories
+ # # Returns if found
+ # mkdir -p "${HOME}/.config/finwo/dep/repositories.d"
+ # while read repo; do
+
+ # # Trim whitespace
+ # repo=${repo##*( )}
+ # repo=${repo%%*( )}
+
+ # # Remove comments and empty lines
+ # if [[ "${repo:0:1}" == '#' ]] || [[ "${repo:0:1}" == ';' ]] || [[ "${#repo}" == 0 ]]; then
+ # continue
+ # fi
+
+ # while read line; do
+ # pkgname="${line%%=*}"
+ # pkgloc="${line##*=}"
+ # # If found, return it
+ # if [ "${pkgname}" == "$1" ]; then
+ # CMD_ADD_SRC="${pkgloc}"
+ # break 2
+ # fi
+ # done < <(curl --location --silent "${repo}")
+ # done < <(find "${HOME}/.config/finwo/dep/repositories.d" -type f -name '*.cnf' | xargs -n 1 -P 1 cat)
+
+ # # Need 2 arguments from here on out
+ # if [ -z "${CMD_ADD_SRC}" ] && [ $# != 2 ]; then
+ # echo "Add command requires 2 arguments" >&2
+ # exit 1
+ # fi
+
+ # CMD_ADD_PKG="$1"
+ # if [ -z "${CMD_ADD_SRC}" ]; then
+ # CMD_ADD_SRC="$2"
+ # fi
return 0
}
@@ -223,7 +223,34 @@ function cmd_a {
}
function cmd_add {
OLD_PKG=$(ini_foreach ini_output_full "package.ini")
- (echo "dependencies.${CMD_ADD_PKG}=${CMD_ADD_SRC}" ; echo -e "${OLD_PKG}") | ini_write "package.ini"
+ CHANNEL=$(ini_foreach ini_output_value "package.ini" "package.channel" | tail -n 1)
+
+ # Get target & version
+ PKG=(${CMD_ADD_ARGS[0]//@/ })
+ if [[ "${PKG[1]}" == "" ]]; then PKG[1]=$CHANNEL; fi
+
+ # Find the package in the package cache
+ PKGINIV="${HOME}/.config/finwo/dep/packages/${PKG[0]}/${PKG[1]}/package.ini"
+ PKGINIB="${HOME}/.config/finwo/dep/packages/${PKG[0]}/package.ini"
+ PKGINI=
+ if [ -f "${PKGINIB}" ]; then PKGINI="${PKGINIB}"; fi
+ if [ -f "${PKGINIV}" ]; then PKGINI="${PKGINIV}"; fi
+ if [ -z "${PKGINI}" ]; then
+ echo "Package not found. Did you update your repositories?" >&2
+ exit 1
+ fi
+
+
+ echo $CHANNEL
+ echo $PKGINIB
+ echo $PKGINIV
+ echo $PKGINI
+ echo ${PKG[0]}
+ echo ${PKG[1]}
+
+
+
+ # (echo "dependencies.${CMD_ADD_PKG}=${CMD_ADD_SRC}" ; echo -e "${OLD_PKG}") | ini_write "package.ini"
}
cmds[${#cmds[*]}]="a"
diff --git a/src/command/add/index.sh b/src/command/add/index.sh
@@ -4,50 +4,50 @@ read -r -d '' help_topics[add] <<- EOF
# #include "help.txt"
EOF
-CMD_ADD_PKG=
-CMD_ADD_SRC=
+CMD_ADD_ARGS=
function arg_a {
arg_add "$@"
return $?
}
function arg_add {
+ CMD_ADD_ARGS=("$@")
- # Check if name exists in the repositories
- # Returns if found
- mkdir -p "${HOME}/.config/finwo/dep/repositories.d"
- while read repo; do
-
- # Trim whitespace
- repo=${repo##*( )}
- repo=${repo%%*( )}
-
- # Remove comments and empty lines
- if [[ "${repo:0:1}" == '#' ]] || [[ "${repo:0:1}" == ';' ]] || [[ "${#repo}" == 0 ]]; then
- continue
- fi
-
- while read line; do
- pkgname="${line%%=*}"
- pkgloc="${line##*=}"
- # If found, return it
- if [ "${pkgname}" == "$1" ]; then
- CMD_ADD_SRC="${pkgloc}"
- break 2
- fi
- done < <(curl --location --silent "${repo}")
- done < <(find "${HOME}/.config/finwo/dep/repositories.d" -type f -name '*.cnf' | xargs -n 1 -P 1 cat)
-
- # Need 2 arguments from here on out
- if [ -z "${CMD_ADD_SRC}" ] && [ $# != 2 ]; then
- echo "Add command requires 2 arguments" >&2
- exit 1
- fi
+ # # Check if name exists in the repositories
+ # # Returns if found
+ # mkdir -p "${HOME}/.config/finwo/dep/repositories.d"
+ # while read repo; do
- CMD_ADD_PKG="$1"
- if [ -z "${CMD_ADD_SRC}" ]; then
- CMD_ADD_SRC="$2"
- fi
+ # # Trim whitespace
+ # repo=${repo##*( )}
+ # repo=${repo%%*( )}
+
+ # # Remove comments and empty lines
+ # if [[ "${repo:0:1}" == '#' ]] || [[ "${repo:0:1}" == ';' ]] || [[ "${#repo}" == 0 ]]; then
+ # continue
+ # fi
+
+ # while read line; do
+ # pkgname="${line%%=*}"
+ # pkgloc="${line##*=}"
+ # # If found, return it
+ # if [ "${pkgname}" == "$1" ]; then
+ # CMD_ADD_SRC="${pkgloc}"
+ # break 2
+ # fi
+ # done < <(curl --location --silent "${repo}")
+ # done < <(find "${HOME}/.config/finwo/dep/repositories.d" -type f -name '*.cnf' | xargs -n 1 -P 1 cat)
+
+ # # Need 2 arguments from here on out
+ # if [ -z "${CMD_ADD_SRC}" ] && [ $# != 2 ]; then
+ # echo "Add command requires 2 arguments" >&2
+ # exit 1
+ # fi
+
+ # CMD_ADD_PKG="$1"
+ # if [ -z "${CMD_ADD_SRC}" ]; then
+ # CMD_ADD_SRC="$2"
+ # fi
return 0
}
@@ -58,7 +58,34 @@ function cmd_a {
}
function cmd_add {
OLD_PKG=$(ini_foreach ini_output_full "package.ini")
- (echo "dependencies.${CMD_ADD_PKG}=${CMD_ADD_SRC}" ; echo -e "${OLD_PKG}") | ini_write "package.ini"
+ CHANNEL=$(ini_foreach ini_output_value "package.ini" "package.channel" | tail -n 1)
+
+ # Get target & version
+ PKG=(${CMD_ADD_ARGS[0]//@/ })
+ if [[ "${PKG[1]}" == "" ]]; then PKG[1]=$CHANNEL; fi
+
+ # Find the package in the package cache
+ PKGINIV="${HOME}/.config/finwo/__NAME/packages/${PKG[0]}/${PKG[1]}/package.ini"
+ PKGINIB="${HOME}/.config/finwo/__NAME/packages/${PKG[0]}/package.ini"
+ PKGINI=
+ if [ -f "${PKGINIB}" ]; then PKGINI="${PKGINIB}"; fi
+ if [ -f "${PKGINIV}" ]; then PKGINI="${PKGINIV}"; fi
+ if [ -z "${PKGINI}" ]; then
+ echo "Package not found. Did you update your repositories?" >&2
+ exit 1
+ fi
+
+
+ echo $CHANNEL
+ echo $PKGINIB
+ echo $PKGINIV
+ echo $PKGINI
+ echo ${PKG[0]}
+ echo ${PKG[1]}
+
+
+
+ # (echo "dependencies.${CMD_ADD_PKG}=${CMD_ADD_SRC}" ; echo -e "${OLD_PKG}") | ini_write "package.ini"
}
cmds[${#cmds[*]}]="a"
