Merge branch 'master' into dev

This commit is contained in:
Knah Tsaeb 2013-07-30 17:23:31 +02:00
commit df7bb53581

View file

@ -4,7 +4,7 @@ tempDest=/path/of/sovigall/tmp/
threads=3 # nb cpu core - 1 threads=3 # nb cpu core - 1
cd $tempDest cd $tempDest
nbProcessLauch=$(ps -e | grep -v grep | grep youtube-dl | wc -l) nbProcessLauch=$(ps -ef | grep -v grep | grep youtube-dl | wc -l)
if [ $nbProcessLauch != 0 ] if [ $nbProcessLauch != 0 ]
then then
@ -14,7 +14,7 @@ fi
for file in $tempDest*.hash for file in $tempDest*.hash
do do
if [[ -f $file ]]; if [ -f $file ];
then then
while read urlHash url destination while read urlHash url destination
do do