Commit cad9939b authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

Remplacement de wget par curl #123

parent 731596d0

tools/max.sh

+5 −12
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ install_jar_in_libs(){ 
  d=`dirname $basex_libs`/../lib

  if [ ! -f $d/$jar_name ]

  then

    wget $jar_url

    echo "Downloading jar "$jar_url

    curl --silent -O $jar_url

    ret_code=$?

    if [ $ret_code -gt 0 ]

    then
@@ -51,13 +52,7 @@ echo "---------------------------" 
echo "  MaX - Utilities - "$MAX_VERSION

echo "---------------------------"



dependencies=(wget npm xmllint)



for bin in ${dependencies[@]}

do

    dependency_test $bin

done



dependency_test xmllint



#checks and set basex bin

a=$(command -v basexclient)
@@ -233,7 +228,7 @@ install_demo(){ 


  cd $DIRECTORY/../editions

  echo "Downloading Max Demo resources at "$url .

  wget $url

  curl --silent -O $url

  getResult=$?

  if [ $getResult -ne 0 ]

  then
@@ -366,13 +361,11 @@ new_edition_build(){ 




init_dev_max(){

    dependency_test npm

    cd $DIRECTORY/..

    #echo " -> Fetches node dependencies."

    npm install

    echo " -> Adds nodes_modules/.ignore file."

    #creates a .ignore file in nodejs dependencies folder

    touch $DIRECTORY"/../node_modules/.ignore"



    echo -e "\n disabling all plugins (.ignore file)"

    for i in `ls $MAX_PLUGINS_DIR`

    do