|
@@ -18,7 +18,7 @@ if [ -n "${md5}" ]; then
|
|
|
sleep 1
|
|
sleep 1
|
|
|
local md5sumcmd=$(md5sum "${filedir}/${filename}"|awk '{print $1;}')
|
|
local md5sumcmd=$(md5sum "${filedir}/${filename}"|awk '{print $1;}')
|
|
|
if [ "${md5sumcmd}" != "${md5}" ]; then
|
|
if [ "${md5sumcmd}" != "${md5}" ]; then
|
|
|
- fn_printfaileol
|
|
|
|
|
|
|
+ fn_printfaileolnl
|
|
|
echo "${filename} returned MD5 checksum: ${md5sumcmd}"
|
|
echo "${filename} returned MD5 checksum: ${md5sumcmd}"
|
|
|
echo "expected MD5 checksum: ${md5}"
|
|
echo "expected MD5 checksum: ${md5}"
|
|
|
fn_scriptlog "failed to verify ${filename} with MD5"
|
|
fn_scriptlog "failed to verify ${filename} with MD5"
|
|
@@ -26,7 +26,7 @@ if [ -n "${md5}" ]; then
|
|
|
fn_scriptlog "expected MD5 checksum: ${md5}"
|
|
fn_scriptlog "expected MD5 checksum: ${md5}"
|
|
|
exit 1
|
|
exit 1
|
|
|
else
|
|
else
|
|
|
- fn_printokeol
|
|
|
|
|
|
|
+ fn_printokeolnl
|
|
|
fn_scriptlog "verifyed ${filename} with MD5"
|
|
fn_scriptlog "verifyed ${filename} with MD5"
|
|
|
fn_scriptlog "${filename} returned MD5 checksum: ${md5sumcmd}"
|
|
fn_scriptlog "${filename} returned MD5 checksum: ${md5sumcmd}"
|
|
|
fn_scriptlog "expected MD5 checksum: ${md5}"
|
|
fn_scriptlog "expected MD5 checksum: ${md5}"
|
|
@@ -49,11 +49,11 @@ elif [ "${mime}" == "application/x-bzip2" ]; then
|
|
|
fi
|
|
fi
|
|
|
local exitcode=$?
|
|
local exitcode=$?
|
|
|
if [ ${exitcode} -ne 0 ]; then
|
|
if [ ${exitcode} -ne 0 ]; then
|
|
|
- fn_printfaileol
|
|
|
|
|
|
|
+ fn_printfaileolnl
|
|
|
echo "${tarcmd}"
|
|
echo "${tarcmd}"
|
|
|
exit ${exitcode}
|
|
exit ${exitcode}
|
|
|
else
|
|
else
|
|
|
- fn_printokeol
|
|
|
|
|
|
|
+ fn_printokeolnl
|
|
|
fi
|
|
fi
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -108,17 +108,17 @@ if [ ! -f "${filedir}/${filename}" ]; then
|
|
|
fi
|
|
fi
|
|
|
local exitcode=$?
|
|
local exitcode=$?
|
|
|
if [ ${exitcode} -ne 0 ]; then
|
|
if [ ${exitcode} -ne 0 ]; then
|
|
|
- fn_printfaileol
|
|
|
|
|
|
|
+ fn_printfaileolnl
|
|
|
echo "${curlcmd}"
|
|
echo "${curlcmd}"
|
|
|
echo -e "${fileurl}\n"
|
|
echo -e "${fileurl}\n"
|
|
|
exit ${exitcode}
|
|
exit ${exitcode}
|
|
|
else
|
|
else
|
|
|
- fn_printokeol
|
|
|
|
|
|
|
+ fn_printokeolnl
|
|
|
fi
|
|
fi
|
|
|
# remove trap
|
|
# remove trap
|
|
|
trap - INT
|
|
trap - INT
|
|
|
else
|
|
else
|
|
|
- fn_printfaileol
|
|
|
|
|
|
|
+ fn_printfaileolnl
|
|
|
echo "Curl is not installed!"
|
|
echo "Curl is not installed!"
|
|
|
echo -e ""
|
|
echo -e ""
|
|
|
exit 1
|
|
exit 1
|