ok
This commit is contained in:
parent
5b93cb7aba
commit
927b02c0f3
47
src/glacier
47
src/glacier
@ -18,52 +18,21 @@
|
|||||||
|
|
||||||
. /etc/glacier/hooks
|
. /etc/glacier/hooks
|
||||||
|
|
||||||
#get_pkg() {
|
|
||||||
# printf "$blue[ i ]$reset Downloading archive for package '$2'...\n"
|
|
||||||
# $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
|
|
||||||
# if [ "$?" != "0" ]; then
|
|
||||||
# printf "$red[ $error ]$reset Package '$2' not found.\n"
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
# $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
|
|
||||||
# if [ "$?" != "0" ]; then
|
|
||||||
# printf "$red[ $error ]$reset Package checksum not found.\n"
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
#}
|
|
||||||
|
|
||||||
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
|
|
||||||
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
|
|
||||||
$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
|
|
||||||
if [ "$?" != "0" ]; then
|
if [ "$?" != "0" ]; then
|
||||||
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
|
|
||||||
|
|
||||||
printf "$blue[ i ]$reset Downloading checksum for package '$2'...\n"
|
printf "$blue[ i ]$reset Downloading checksum for package '$2'...\n"
|
||||||
for r in ${ALLOWED_REPOS[@]}; do
|
for r in ${ALLOWED_REPOS[@]}; do
|
||||||
$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.checksum
|
$GLACIER_DOWNLOAD_BACKEND $GREPO/${r}/$2.checksum
|
||||||
done
|
done
|
||||||
find $2.checksum
|
find $2.checksum
|
||||||
=======
|
|
||||||
=======
|
|
||||||
>>>>>>> main
|
|
||||||
# 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
|
|
||||||
>>>>>>> main
|
|
||||||
if [ "$?" != "0" ]; then
|
if [ "$?" != "0" ]; then
|
||||||
printf "$red[ $error ]$reset Package checksum not found.\n"
|
printf "$red[ $error ]$reset Package checksum not found.\n"
|
||||||
exit 1
|
exit 1
|
||||||
@ -164,15 +133,7 @@ clear_cache() {
|
|||||||
#
|
#
|
||||||
|
|
||||||
debug_info() {
|
debug_info() {
|
||||||
<<<<<<< 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"
|
|
||||||
>>>>>>> main
|
|
||||||
printf ">> Checking for valid download backend...\n"
|
printf ">> Checking for valid download backend...\n"
|
||||||
whereis wget
|
whereis wget
|
||||||
whereis curl
|
whereis curl
|
||||||
@ -305,15 +266,7 @@ case $1 in
|
|||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
-v|--version)
|
-v|--version)
|
||||||
<<<<<<< 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"
|
|
||||||
>>>>>>> main
|
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
-f|install)
|
-f|install)
|
||||||
|
Loading…
Reference in New Issue
Block a user