diff --git a/install.sh b/install.sh index 034433d6..047e1ae1 100755 --- a/install.sh +++ b/install.sh @@ -174,32 +174,9 @@ echo "/ip4/127.0.0.1/tcp/5001" > ~/.ipfs/api ~/.zen/Astroport.ONE/setup.sh - -echo "#############################################" -echo "#############################################" - ## Desktop install - echo "Astroport.ONE INSTALL" - end=`date +%s` -echo Execution time was `expr $end - $start` seconds. -echo "#############################################" -echo "%%%%%%%%%%%%%%%%%%%%" -echo "SI VOUS AVEZ DEJA UN COMPTE SUR GCHANGE ?" -echo " Saisissez vos identifiants" -echo "%%%%%%%%%%%%%%%%%%%%" -echo "#############################################" - -if [[ $XDG_SESSION_TYPE == 'x11' ]]; then -########################################################## - ## ON BOARDING PLAYER - ~/.zen/Astroport.ONE/start.sh - ~/.zen/Astroport.ONE/tools/displaytimer.sh 3 - espeak "Enter your magic TW keys" - xdg-open "http://astroport.localhost:1234" - +if [[ $(which kodi) && $XDG_SESSION_TYPE == 'x11' ]]; then +( echo " ### EXPERIMENTAL ### FINISH ASTROPORT/KODI SETUP BY IPFS ## OUI ? ENTER sinon Ctrl+C" -[[ $(which kodi) ]] && read KODI - if [[ ! $KODI || $KODI == "OUI" ]]; then - mkdir -p ~/.zen/tmp/kodi echo "PATIENTEZ..." ipfs get -o ~/.zen/tmp/kodi/ /ipfs/Qmc763hnsuTqSTDBNagmzca4fSzmcTp9kHoeosaPKC8QvK @@ -212,15 +189,31 @@ echo " ### EXPERIMENTAL ### FINISH ASTROPORT/KODI SETUP BY IPFS ## OUI ? ENTER s && [[ -f uqload_downloader ]] && sudo mv uqload_downloader /usr/local/bin/ \ && sudo ln -s ~/.zen/Astroport.ONE/tools/download_from_kodi_log.sh /usr/local/bin/download_from_kodi_log \ || echo "SOMETHING IS NOT WORKING WELL : PLEASE CREATE AN ISSSUE" - - - cd $MY_PATH - - fi - - +) & fi +echo "#############################################" +echo "#############################################" + echo "Astroport.ONE INSTALLATION" + end=`date +%s` +echo Execution time was `expr $end - $start` seconds. +echo "#############################################" +echo "%%%%%%%%%%%%%%%%%%%%" +echo "IMPORTER VOTRE COMPTE GCHANGE" +echo " " +echo "%%%%%%%%%%%%%%%%%%%%" +echo "#############################################" + +########################################################## + ## ON BOARDING PLAYER + # ~/.zen/Astroport.ONE/start.sh + ~/.zen/Astroport.ONE/tools/displaytimer.sh 3 + espeak "Please create a player" + [[ $XDG_SESSION_TYPE == 'x11' ]] \ + && xdg-open "http://astroport.localhost:1234" \ + || ~/.zen/Astroport.ONE/comand.sh + + else echo "Installation existante !! diff --git a/tools/tusc b/tools/tusc index b502f1e5..b1c044c2 100755 --- a/tools/tusc +++ b/tools/tusc @@ -12,8 +12,6 @@ if [[ -f $HOME/.tus.dbg ]]; then set -ex; else set -e; fi FULL=$(readlink -f $0) TUSC=$(basename $0) SPINID=0 CURLARGS= -DEBUG=1 - declare -A HEADERS # assoc headers of last request declare ISOK=0 # is last request ok? @@ -98,7 +96,7 @@ tus-config() # $1 = key, $2 = value # create a part of file filepart() # $1 = start_byte, $2 = byte_length, $3 = file { - dd bs=32M skip="$1" count="$2" iflag=skip_bytes ${3:+if="$3"} ${3:+of="$3.part"} + dd bs=1M skip="$1" count="$2" iflag=skip_bytes ${3:+if="$3"} ${3:+of="$3.part"} echo `realpath $3.part` } @@ -108,8 +106,8 @@ request() { echo > $HEADER [[ $CREDS ]] && USERPASS="--basic --user '$USER:$PASS' " - [[ $DEBUG ]] && comment "> curl ${USERPASS//:$PASS/}-sSLD $HEADER -H 'Tus-Resumable: 1.0.0' $1" - BODY=$(bash -c "curl $USERPASS-sSLD $HEADER -H 'Tus-Resumable: 1.0.0' $CURLARGS $1") HEADERS=() + [[ $DEBUG ]] && comment "> curl ${USERPASS//:$PASS/}-sSLD $HEADER -H 'Tus-Resumable: 1.0.0' --cookie $1" + BODY=$(bash -c "curl $USERPASS-sSLD $HEADER -H 'Tus-Resumable: 1.0.0' $CURLARGS --cookie $1") HEADERS=() while IFS=':' read key value; do if [[ "${key:0:5}" == "HTTP/" ]]; then