Compare commits

..

2 Commits

Author SHA1 Message Date
b1ek 622dec4827
(fix) fix some obscure problems 2024-02-14 11:54:09 +10:00
b1ek cd3ecd81c4
(feat) proper file downloading mechanism 2024-02-14 11:44:10 +10:00
2 changed files with 87 additions and 13 deletions

View File

@ -7,6 +7,7 @@
# settings
set -e
start_time=$(date +%s)
# functions
errcho() {
@ -60,6 +61,34 @@ user_confirm() {
done
}
bricksenv() {
echo "export BRICKS_DIR=$BRICKS_DIR"
echo "export BRICKS_DB=$BRICKS_DB"
echo "export AUTOMATIC=$AUTOMATIC"
}
tmpdir() {
if ! [ -f $BRICKS_DIR/.tmp ]; then
mkdir -p $BRICKS_DB/.tmp
fi
echo $BRICKS_DB/.tmp
}
# checking that brick's dependencies are installed
BRICK_DEPS=(curl)
NO_DEPS=()
for dep in ${BRICK_DEPS[@]}; do
if ! command -v $dep > /dev/null; then
NO_DEPS=(${NO_DEPS[@]} $dep)
fi
done
if ! [ "${#NO_DEPS[@]}" == "0" ]; then
errcho 'Error!'
errcho 'brick itself depends on some stuff, which you dont have installed:'
errcho "${NO_DEPS[@]}"
fi
# some vars
BRICKS_DIR=${BRICKS_DIR:-}
PKGS=()
@ -138,7 +167,7 @@ if [ "${#PKGS[@]}" == "0" ]; then
inf "nothing to do"
exit
else
echo "Packages to install: ${PKGS[@]}"
inf "Packages to install: ${PKGS[@]}"
user_confirm
fi
@ -170,6 +199,7 @@ if [ "${#PACDEPS[@]}" != "0" ]; then
inf "removed $removed installed pacman deps"
fi
# then there might actually be no work to be done
if [ "$TO_INSTALL" != "" ]; then
inf "installing pacman packages:"
inf "$TO_INSTALL"
@ -190,17 +220,60 @@ else
inf "no pacman deps to install"
fi
DOWNLOADED_FILES=()
i=1
# pacman deps installed, lets install the actual shit
for pkg in "${PKGS[@]}"; do
inf "installing $pkg [$i/${#PKGS[@]}]"
exec_brick() {
echo -e "$(bricksenv)$1" | bash
}
# first check if there is stuff we need to download for that brick
SCRIPT="
source $(getbrick $pkg)
if [ -z ${var+x} ]; then
echo \${downloads[@]}
fi
"
DOWNLOADS=$(exec_brick "$SCRIPT")
DOWNLOADS_MAP=()
if ! [ "$DOWNLOADS" == "" ]; then
DOWNLOADS=($DOWNLOADS)
inf "$(inf "downloading files for $pkg...")"
ii=1
for download in $DOWNLOADS; do
curl -s $download > $(tmpdir)/$pkg-file-$i &
DOWNLOADS_MAP=(${DOWNLOADS_MAP[@]} $(tmpdir)/$pkg-file-$i)
ii=$(($ii + 1))
done
wait
inf "$(inf "downloaded")"
fi
DOWNLOADED_FILES=(${DOWNLOADED_FILES[@]} ${DOWNLOADS_MAP[@]})
SCRIPT="
export BRICKS_DIR=$BRICKS_DIR
export BRICKS_DB=$BRICKS_DB
source $(getbrick $pkg)\n
install"
echo -e "$SCRIPT" | bash > $BRICKS_DB/.$pkg-install-log
downloads=(${DOWNLOADS_MAP[@]})\n
install
"
inf "installing $pkg [$i/${#PKGS[@]}]"
exec_brick "$SCRIPT" > $BRICKS_DB/.$pkg-install-log
i=$(($i + 1))
done
inf "done"
if ! [ "${#DOWNLOADED_FILES[@]}" == "0" ]; then
inf 'cleaning up downloaded files'
for file in $DOWNLOADED_FILES; do
rm $file &
done
wait
fi
inf "done in $(($(date +%s) - $start_time)) seconds"

View File

@ -4,6 +4,9 @@
# GPL3 only
# uwu
downloads=(
https://example.com/script.sh
)
info() {
echo this brick does this and that
@ -23,11 +26,9 @@ pkgs() {
}
install() {
# these 2 lines are to prevent it from being installed
errcho '`example` brick is not an installable brick, its for packaging reference only'
exit 1
sh -c "$(curl https://example.com/script.sh)"
echo this is a dummy package, it is not meant to actually be installed, silly
return
sh -c "$(cat ${downloads[0]})"
}
uninstall() {