fixing several logic errors

This commit is contained in:
2015-06-16 16:57:41 +03:00
parent c613d45c22
commit b7e461d2c0

View File

@@ -2,7 +2,7 @@
FILE="$1"
TYPE="$2"
SPLITSIZE="10M"
SPLITSIZE="100M"
INFO="info.cfg"
# Check if 2 params are given
@@ -121,7 +121,8 @@ FOLDER="dl-$FILE"
checkfolder $FOLDER
INFO="$FOLDER/$INFO"
INFONAME=$INFO
INFO="$FOLDER/$INFONAME"
echo "[INFO] Calculating size and MD5 sum..."
BIGNAME=$(basename $FILE)
@@ -138,10 +139,10 @@ split --verbose -a 4 -b $SPLITSIZE $FILE $FOLDER/dl-
# List all splitted files, measure size and md5sum
echo "[INFO] Creating info document with necessary specs..."
SMALLNO=$(ls $FOLDER | grep -v $INFO | wc -l)
SMALLNO=$(ls $FOLDER | grep -v $INFONAME | wc -l)
echo "SMALLNO=$SMALLNO" >> $INFO
NO=0
ls $FOLDER | grep -v $INFO | while read -r line; do
ls $FOLDER | grep -v $INFONAME | while read -r line; do
SMALLNAME=$line
SMALLSIZE=$(getdu $FOLDER/$SMALLNAME)
@@ -254,7 +255,8 @@ until [ "$STATUS" == "F" ]; do
# File already exists, has correct size, and has correct MD5
elif [ -e $SMALLPATH ] && $(compdu $SMALLPATH $SMALLSIZE) && $(compmd5 $SMALLPATH $SMALLMD5); then
echo "[SUCCESS] File already exists and is valid."
STATUS="C"
# This shouldn't happen...
else
echo "Dafuq?!"
@@ -265,7 +267,7 @@ until [ "$STATUS" == "F" ]; do
if [ $NO -lt $SMALLNO ]; then
echo "[INFO] Starting next download."
STATUS="C"
elif [ $NO -lt $SMALLNO ] && [ "$STATUS" == "C" ]; then
elif [ $NO -ge $SMALLNO ] && [ "$STATUS" == "C" ]; then
echo "[SUCCESS] Downloading finished."
STATUS="F"
else