test

change to curl -s -r 0-1000

bashbirds.sh

@@ -1,6 +1,42 @@
 #!/usr/bin/env bash
 
-VERSION="v1.1"
+VERSION="v1.1.4"
+
+### Variables for self updating
+ScriptArgs=( "$@" )
+ScriptPath="$(readlink -f "$0")"			# /Users/bruno/Documents/Scripts/bashbirds/bashbirds.sh
+ScriptWorkDir="$(dirname "$ScriptPath")"	# /Users/bruno/Documents/Scripts/bashbirds
+
+dotenv () {
+  set -a
+  # shellcheck disable=SC1091
+  [ -f "$ScriptWorkDir/.env" ] && . "$ScriptWorkDir/.env" || echo -e "${red}\nNo .env file found ! Could'nt get update from Github.'.${reset}"
+  set +a
+}
+
+dotenv
+
+### ChangeNotes: 1.1.4	curl 2ko
+### ChangeNotes: 1.1.3	Won't display Changes notes
+### ChangeNotes: 1.1.1	Bugfix .env path
+### ChangeNotes: 1.1	Bugfix when script was run with symlink
+### ChangeNotes: 1.0	Minor corrections.
+
+Github="https://github.com/bruno21/bashbirds"
+# Public Repo:
+#RawUrl="https://raw.githubusercontent.com/Bruno21/bashbirds/main/bashbirds.sh"
+# Private Repo:
+RawUrl="https://x-access-token:$GITHUB_TOKEN@raw.githubusercontent.com/Bruno21/bashbirds/main/bashbirds.sh"
+
+### Check if there's a new release of the script:
+LatestRelease="$(curl -s -r 0-50 $RawUrl | sed -n "/VERSION/s/VERSION=//p" | tr -d '"')"
+#LatestChanges="$(curl -s -r 0-2000 $RawUrl | sed -n "/ChangeNotes/s/# ChangeNotes: //p")"
+LatestChanges="$(curl -s -r 0-2000 $RawUrl | grep "^### ChangeNotes:" | sed 's/### ChangeNotes://g')"
+
+#[[ $LatestRelease != $VERSION ]] && new="($LatestRelease)" || new=""
+
+#echo "$LatestRelease"
+#echo "$LatestChanges"
 
 red="\033[1;31m"
 greenbold="\033[1;32m"
@@ -13,31 +49,6 @@ italic="\033[3m"
 underline="\033[4m"
 reset="\033[0m"
 
-dotenv () {
-  set -a
-  # shellcheck disable=SC1091
-  [ -f ".env" ] && . ".env" ||  echo -e "${red}\nNo .env file found ! Could'nt get update from Github.'.${reset}"
-  set +a
-}
-
-dotenv
-
-### ChangeNotes: Minor corrections.
-Github="https://github.com/bruno21/bashbirds"
-# Repo normal:
-#RawUrl="https://raw.githubusercontent.com/Bruno21/bashbirds/main/bashbirds.sh"
-# Repo privé:
-RawUrl="https://x-access-token:$GITHUB_TOKEN@raw.githubusercontent.com/Bruno21/bashbirds/main/bashbirds.sh"
-
-### Variables for self updating
-ScriptArgs=( "$@" )
-ScriptPath="$(readlink -f "$0")"			# /Users/bruno/Documents/Scripts/bashbirds/bashbirds.sh
-ScriptWorkDir="$(dirname "$ScriptPath")"	# /Users/bruno/Documents/Scripts/bashbirds
-
-### Check if there's a new release of the script:
-LatestRelease="$(curl -s -r 0-50 $RawUrl | sed -n "/VERSION/s/VERSION=//p" | tr -d '"')"
-LatestChanges="$(curl -s -r 0-200 $RawUrl | sed -n "/ChangeNotes/s/### ChangeNotes: //p")"
-#[[ $LatestRelease != $VERSION ]] && new="($LatestRelease)" || new=""
 
 echo -e "${yellowbold}Bashbird${reset} $VERSION\n"
 
@@ -71,7 +82,6 @@ req2() {
 	#read -p "Pause: " choice
 
 
-    #query2="SELECT * FROM liste;"
     query2="SELECT Francais, Autres, Latin, Anglais, Ordre, Famille, Liens FROM liste;"
     result2=$(sqlite3 "$ScriptWorkDir/birds.db" "$query2")
     #echo "$result2"
@@ -90,9 +100,6 @@ req2() {
         ln="${array[6]}"
         
         
-        #echo "$ln"
-        #read -r -p "Would you like to update? y/[n]: " SelfUpdate
-        
         [[ $aut != "" ]] && z="($aut)" || z=""
 		
 		if [ $ext = ".md" ]; then
@@ -335,7 +342,7 @@ self_update_curl() {
   if [[ $(builtin type -P curl) ]]; then 
     curl -L $RawUrl > "$ScriptPath" ; chmod +x "$ScriptPath"  
     printf "\n%s\n" "--- starting over with the updated version ---"
-    exec "$ScriptPath" "${ScriptArgs[@]}" # run the new script with old arguments
+    exec "$ScriptPath" "${ScriptArgs[@]}" >/dev/null # run the new script with old arguments
     exit 1 # exit the old instance
   elif [[ $(builtin type -P wget) ]]; then 
     wget $RawUrl -O "$ScriptPath" ; chmod +x "$ScriptPath"
@@ -364,7 +371,7 @@ self_update() {
 
 ### Version check & initiate self update
 if [[ "$VERSION" != "$LatestRelease" ]] ; then 
-  printf "New version available! %b%s%b ⇒ %b%s%b \n Change Notes: %s \n" "$c_yellow" "$VERSION" "$c_reset" "$c_green" "$LatestRelease" "$c_reset" "$LatestChanges"
+  printf "New version available! %b%s%b ⇒ %b%s%b \nChange Notes:\n%s \n" "$c_yellow" "$VERSION" "$c_reset" "$c_green" "$LatestRelease" "$c_reset" "$LatestChanges"
   if [[ -z "$AutoUp" ]] ; then 
     read -r -p "Would you like to update? y/[n]: " SelfUpdate
     [[ "$SelfUpdate" =~ [yY] ]] && self_update