Merge pull request #2 from YunoHost-Apps/testing

Testing

.github/workflows/updater.sh

@@ -17,8 +17,8 @@
 #=================================================
 
 # Fetching information
-current_version=$(cat manifest.toml | awk -v key="version" '$1 == key { gsub("\"","",$3);print $3 }' | awk -F'~' '{print $1}')
+current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]')
-repo=$(cat manifest.toml | awk -v key="code" '$1 == key { gsub("\"","",$3);print $3 }' | awk -F'https://github.com/' '{print $2}')
+repo=$(cat manifest.toml | tomlq -j '.upstream.code|split("https://github.com/")[1]')
 
 # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
 version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
@@ -27,7 +27,8 @@ assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[
 # Later down the script, we assume the version has only digits and dots
 # Sometimes the release name starts with a "v", so let's filter it out.
 # You may need more tweaks here if the upstream repository has different naming conventions. 
-if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
+if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]
+then
 	version=${version:1}
 fi
 
@@ -40,11 +41,13 @@ echo "REPO=$repo" >> $GITHUB_ENV
 echo "PROCEED=false" >> $GITHUB_ENV
 
 # Proceed only if the retrieved version is greater than the current one
-if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
+if ! dpkg --compare-versions "$current_version" "lt" "$version"
+then
 	echo "::warning ::No new version available"
 	exit 0
 # Proceed only if a PR for this new version does not already exist
-elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
+elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version
+then
 	echo "::warning ::A branch already exists for this update"
 	exit 0
 fi
@@ -60,75 +63,88 @@ echo "${#assets[@]} available asset(s)"
 # Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like.
 
 # Let's loop over the array of assets URLs
-for asset_url in ${assets[@]}; do
+for asset_url in ${assets[@]}
+do
 
-echo "Handling asset at $asset_url"
+	filename=${asset_url##*/}
+	echo "Handling asset $filename at $asset_url"
 	
-# Assign the asset to a source file in conf/ directory
+
-# Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
+	# Assign the asset to a source file in conf/ directory
-# Leave $src empty to ignore the asset
+	# Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
-case $asset_url in
+	# Leave $src empty to ignore the asset
-  *"scrutiny-collector-metrics-linux-amd64"*)
+	case $asset_url in
-    src="scrutiny-collector-metrics-linux-amd64"
-    ;;
-  *"scrutiny-collector-metrics-linux-arm64"*)
-    src="scrutiny-collector-metrics-linux-arm64"
-    ;;
 		*"scrutiny-web-frontend.tar.gz"*)
-    src="scrutiny-web-frontend.tar.gz"
+			#arch=""
 			;;
 		*"scrutiny-web-linux-amd64"*)
-    src="scrutiny-web-linux-amd64"
+			#arch="amd64"
 			;;
 		*"scrutiny-web-linux-arm64"*)
-    src="scrutiny-web-linux-arm64"
+			#arch="arm64"
+			;;
+		*"scrutiny-collector-metrics-linux-amd64"*)
+			#arch="amd64"
+			;;
+		*"scrutiny-collector-metrics-linux-arm64"*)
+			#arch="arm64"
 			;;
 		*)
-    src=""
+			filename=""
 		;;
-esac
+	esac
 		
-# If $src is not empty, let's process the asset
+	# If $src is not empty, let's process the asset
-if [ ! -z "$src" ]; then
+	if [ ! -z "$filename" ]
+	then
 
-# Create the temporary directory
+		# Create the temporary directory
-tempdir="$(mktemp -d)"
+		tempdir="$(mktemp -d)"
 
-# Download sources and calculate checksum
+		# Download sources and calculate checksum
-filename=${asset_url##*/}
+		curl --silent -4 -L $asset_url -o "$tempdir/$filename"
-curl --silent -4 -L $asset_url -o "$tempdir/$filename"
+		checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
-checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
 
-# Delete temporary directory
+		# Delete temporary directory
-rm -rf $tempdir
+		rm -rf $tempdir
 
-# Get extension
+		#DOES NOT WORK BECAUSE IT REORDER ALL THE MANIFEST IN A STRANGE WAY
-if [[ $filename == *.tar.gz ]]; then
+		# Rewrite sources in manifest.toml
-  extension=tar.gz
+# 		if [ -z "$arch" ]
+# 		then
+# 			echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.url = \"$asset_url\"" manifest.toml)" > manifest.toml
+# 			echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.sha256 = \"$checksum\"" manifest.toml)" > manifest.toml
+# 		else
+# 			echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.$arch.url = \"$asset_url\"" manifest.toml)" > manifest.toml
+# 			echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .resources.sources.$src.$arch.sha256 = \"$checksum\"" manifest.toml)" > manifest.toml
+# 		fi
+		
+		# Get extension
+		if [[ $filename == *.tar.gz ]]
+		then
+			extension="tar.gz"
+			subdir=true
 			extract=true
-elif [[ $filename == ${filename##*.} ]]; then
+		else
-    extension=""
+			extension="binary"
+			subdir=""
 			extract=false
-else
+		fi
-    extension=${filename##*.}
-    extract=false
-fi
 
-# Rewrite source file
+		# Rewrite source file
-cat <<EOT > conf/src/$src.src
+		cat <<EOT > conf/src/$filename.src
 SOURCE_URL=$asset_url
 SOURCE_SUM=$checksum
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=$subdir
-SOURCE_FILENAME=$filename
 SOURCE_EXTRACT=$extract
 EOT
-echo "... conf/src/$src.src updated"
+		echo "... conf/src/$filename.src updated"
 
-else
+	else
-echo "... asset ignored"
+		echo "... asset ignored"
-fi
+	fi
 
 done
 
@@ -144,7 +160,9 @@ done
 #=================================================
 
 # Replace new version in manifest
-sed -i "s/^version = .*/version = \"$version~ynh1\"/" manifest.toml
+sed --in-place "s/^version = .*/version = \"$version~ynh1\"/" manifest.toml
+#DOES NOT WORK BECAUSE IT REORDER ALL THE MANIFEST IN A STRANGE WAY
+#echo "$(tomlq --toml-output --slurp --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml 
 
 # No need to update the README, yunohost-bot takes care of it
 

.github/workflows/updater.yml

@@ -17,6 +17,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install python
+        uses: actions/setup-python@v4
+      - name: Install yq/tomlq
+        id: install_yq
+        run: pip install yq
       - name: Run the updater script
         id: run_updater
         run: |

README.md

@@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
 - (Future) Hard Drive performance testing & tracking
 
 
-**Shipped version:** 0.6.0~ynh1
+**Shipped version:** 0.6.0~ynh2
 
 ## Screenshots
 

README_fr.md

@@ -35,7 +35,7 @@ Scrutiny is a simple but focused application, with a couple of core features:
 - (Future) Hard Drive performance testing & tracking
 
 
-**Version incluse :** 0.6.0~ynh1
+**Version incluse :** 0.6.0~ynh2
 
 ## Captures d’écran
 

conf/src/scrutiny-collector-metrics-linux-amd64.src

@@ -1,7 +1,6 @@
 SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.6.0/scrutiny-collector-metrics-linux-amd64
 SOURCE_SUM=e744a7b10e764e090ea72cd3a095da83cc1390f95c2d23ef5eabeee40081170f
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=
+SOURCE_FORMAT=binary
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=
-SOURCE_FILENAME=scrutiny-collector-metrics-linux-amd64
 SOURCE_EXTRACT=false

conf/src/scrutiny-collector-metrics-linux-arm64.src

@@ -1,7 +1,6 @@
 SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.6.0/scrutiny-collector-metrics-linux-arm64
 SOURCE_SUM=1f204e54065a3279034d4ab23931d0e387a0bd0ac927940b3b96328b6ec063e0
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=
+SOURCE_FORMAT=binary
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=
-SOURCE_FILENAME=scrutiny-collector-metrics-linux-arm64
 SOURCE_EXTRACT=false

conf/src/scrutiny-web-frontend.tar.gz.src

@@ -3,5 +3,4 @@ SOURCE_SUM=34a3494143b026fbf5bf2472661a6cd8e7eb37421b38f53fba59b2fa0c890896
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=scrutiny-web-frontend.tar.gz
 SOURCE_EXTRACT=true

conf/src/scrutiny-web-linux-amd64.src

@@ -1,7 +1,6 @@
 SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.6.0/scrutiny-web-linux-amd64
 SOURCE_SUM=7fed82275fc0b9865aa05ab444d51175f573897a232a7cd01c0be83b62a510ba
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=
+SOURCE_FORMAT=binary
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=
-SOURCE_FILENAME=scrutiny-web-linux-amd64
 SOURCE_EXTRACT=false

conf/src/scrutiny-web-linux-arm64.src

@@ -1,7 +1,6 @@
 SOURCE_URL=https://github.com/AnalogJ/scrutiny/releases/download/v0.6.0/scrutiny-web-linux-arm64
 SOURCE_SUM=2813c2b9e37625a31b308842d2debd81152693ecc41754d644df8877b4747268
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=
+SOURCE_FORMAT=binary
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=
-SOURCE_FILENAME=scrutiny-web-linux-arm64
 SOURCE_EXTRACT=false

manifest.toml

@@ -4,7 +4,7 @@ id = "scrutiny"
 name = "Scrutiny"
 description.en = "WebUI for smartd S.M.A.R.T monitoring"
 
-version = "0.6.0~ynh1"
+version = "0.6.0~ynh2"
 
 maintainers = ["ewilly"]