EverestLinux/glacier-old
EverestLinux/glacier-old
Template
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflict moment

Browse Source
This commit is contained in:
Liam Waldron 2023-02-01 16:39:28 -05:00
parent 87b85db1ce
commit 5b93cb7aba
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/glacier
View File

@ -34,12 +34,15 @@
get_pkg() { get_pkg() {
printf "$blue[ i ]$reset Downloading archive for package '$2'...\n" printf "$blue[ i ]$reset Downloading archive for package '$2'...\n"
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
for r in ${ALLOWED_REPOS[@]}; do for r in ${ALLOWED_REPOS[@]}; do
$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.tar.gz $GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.tar.gz
done done
find $2.tar.gz find $2.tar.gz
======= =======
=======
>>>>>>> main
# Extremely ugly but does what it needs to do # Extremely ugly but does what it needs to do
$GLACIER_DOWNLOAD_BACKEND $GREPO1/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO2/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO3/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO4/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO5/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO6/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO7/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO8/$2.tar.gz $GLACIER_DOWNLOAD_BACKEND $GREPO1/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO2/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO3/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO4/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO5/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO6/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO7/$2.tar.gz || $GLACIER_DOWNLOAD_BACKEND $GREPO8/$2.tar.gz
>>>>>>> main >>>>>>> main
@ -47,6 +50,7 @@ get_pkg() {
printf "$red[ $error ]$reset Package '$2' not found.\n" printf "$red[ $error ]$reset Package '$2' not found.\n"
exit 1 exit 1
fi fi
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
printf "$blue[ i ]$reset Downloading checksum for package '$2'...\n" printf "$blue[ i ]$reset Downloading checksum for package '$2'...\n"
@ -55,6 +59,8 @@ get_pkg() {
done done
find $2.checksum find $2.checksum
======= =======
=======
>>>>>>> main
# same goes for this # same goes for this
$GLACIER_DOWNLOAD_BACKEND $GREPO1/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO2/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO3/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO4/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO5/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO6/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO7/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO8/$2.tar.gz $GLACIER_DOWNLOAD_BACKEND $GREPO1/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO2/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO3/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO4/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO5/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO6/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO7/$2.checksum || $GLACIER_DOWNLOAD_BACKEND $GREPO8/$2.tar.gz
>>>>>>> main >>>>>>> main
@ -158,8 +164,12 @@ clear_cache() {
# #
debug_info() { debug_info() {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
printf "$blue>> Glacier v3.3.0$reset\n" printf "$blue>> Glacier v3.3.0$reset\n"
=======
printf "$blue>> Glacier v3.2.2$reset\n"
>>>>>>> main
======= =======
printf "$blue>> Glacier v3.2.2$reset\n" printf "$blue>> Glacier v3.2.2$reset\n"
>>>>>>> main >>>>>>> main
@ -295,8 +305,12 @@ case $1 in
exit 0 exit 0
;; ;;
-v|--version) -v|--version)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
printf "${blue}Glacier v3.3.0${reset}\n" printf "${blue}Glacier v3.3.0${reset}\n"
=======
printf "${blue}Glacier v3.2.2${reset}\n"
>>>>>>> main
======= =======
printf "${blue}Glacier v3.2.2${reset}\n" printf "${blue}Glacier v3.2.2${reset}\n"
>>>>>>> main >>>>>>> main