Knah-Tsaeb/Soshot
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

[add] detect plateform arch 64/32 bit

Browse source
This commit is contained in:
Knah Tsaeb 2015-01-09 17:06:23 +01:00
parent 54760730bf
commit d723f0d0dd
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/phantomjs → bin/phantomjs_x64
View file

Binary file not shown.

BIN
bin/phantomjs_x86 Executable file
View file

Binary file not shown.

9
bin/thumb_server.sh
View file

@ -25,6 +25,7 @@ currentProcess=$(ps -e | grep -v grep | grep thumb_ | wc -l)
firstLevel=${hashUrl:0:2} firstLevel=${hashUrl:0:2}
secondLevel=${hashUrl:2:2} secondLevel=${hashUrl:2:2}
startPath=$sizeNameDir/$firstLevel/$secondLevel/ startPath=$sizeNameDir/$firstLevel/$secondLevel/
getArch = $(getconf LONG_BIT)
if [ $site == "manual" ] if [ $site == "manual" ]
then then
@ -54,7 +55,13 @@ then
fi fi
start_time=`date +%s` start_time=`date +%s`
timeout $timeOut ./phantomjs --disk-cache=false --local-storage-path=bin/ --ignore-ssl-errors=true rasterize.js "$site" "../cache/tmp/$hashUrl.png" if [getArch == 64]
then
timeout $timeOut ./phantomjs_x64 --disk-cache=false --local-storage-path=bin/ --ignore-ssl-errors=true rasterize.js "$site" "../cache/tmp/$hashUrl.png"
else
timeout $timeOut ./phantomjs_x86 --disk-cache=false --local-storage-path=bin/ --ignore-ssl-errors=true rasterize.js "$site" "../cache/tmp/$hashUrl.png"
fi
if [ ! -f "../cache/tmp/$hashUrl.png" ] if [ ! -f "../cache/tmp/$hashUrl.png" ]
then then