YunoHost-Apps/dotclear2_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dotclear2_ynh.git synced 2024-09-03 18:26:29 +02:00
Code Issues Activity Actions 1

Merge pull request #77 from YunoHost-Apps/cleanup

Browse source 
Cleanup, updater.sh
This commit is contained in:
Salamandar 2023-12-12 11:37:57 +01:00 committed by GitHub
commit 4228bc2a1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 143 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/updater.sh vendored
View file

@ -14,8 +14,8 @@
#=================================================
# Fetching information
current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
current_version=$(cat manifest.toml | grep "version =" | sed 's|version = "\(.*\)~ynh[0-9]*"|\1|')
# repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
asset=$(curl --silent "https://download.dotclear.org/latest/" | grep "dotclear-.*?.zip" -Po | head -1)
version=${asset%.zip}
version=${version#dotclear-}
@ -54,7 +54,7 @@ src="app"
tempdir="$(mktemp -d)"
# Download sources and calculate checksum
curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.zip -o "$tempdir/$asset"
curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.tar.gz -o "$tempdir/$asset"
checksum=$(sha256sum "$tempdir/$asset" | head -c 64)
# Delete temporary directory
@ -66,17 +66,10 @@ if [[ $asset == *.zip ]]; then
fi
# Rewrite source file
cat <<EOT > conf/$src.src
SOURCE_URL=http://download.dotclear.org/latest/dotclear-$version.zip
SOURCE_SUM=$checksum
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=$extension
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=
SOURCE_EXTRACT=true
EOT
echo "... conf/$src.src updated"
set -x
sed -i "s|/dotclear-.*.tar.gz|/dotclear-$version.tar.gz|" manifest.toml
sed -i "s|sha256 = \".*\"|sha256 = \"$checksum\"|" manifest.toml
sed -i "s|version = \".*\"|version = \"$version~ynh1\"|" manifest.toml
#=================================================
# SPECIFIC UPDATE STEPS
#=================================================
@ -88,9 +81,6 @@ echo "... conf/$src.src updated"
# GENERIC FINALIZATION
#=================================================
# Replace new version in manifest
echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
# No need to update the README, yunohost-bot takes care of it
# The Action will proceed only if the PROCEED environment variable is set to true

12
scripts/_common.sh
View file

@ -8,6 +8,18 @@
# PERSONAL HELPERS
#=================================================
_dotclear2_setup_source() {
# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r)
if curl --output /dev/null --silent --head --fail "$src_url"; then
ynh_setup_source --dest_dir="$install_dir" --source_id="latest"
else
ynh_setup_source --dest_dir="$install_dir" --source_id="attic"
fi
}
#=================================================
# EXPERIMENTAL HELPERS
#=================================================

12
scripts/install
View file

@ -14,13 +14,7 @@ source /usr/share/yunohost/helpers
#=================================================
ynh_script_progression --message="Setting up source files..." --weight=4
# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r)
if ! curl --output /dev/null --silent --head --fail "$src_url"; then
ynh_setup_source --dest_dir="$install_dir" --source_id="attic"
else
ynh_setup_source --dest_dir="$install_dir" --source_id="latest"
fi
_dotclear2_setup_source
chmod 750 "$install_dir"
chmod -R o-rwx "$install_dir"
@ -134,7 +128,9 @@ ynh_local_curl $installUrl "u_email=$email" "u_firstname=$firstname" "u_name=$la
ynh_script_progression --message="Configuring Fail2Ban..."
# Create a dedicated Fail2Ban config
ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: <HOST>, .*https://$domain${path%/}/admin/auth.php"
ynh_add_fail2ban_config \
--logpath="/var/log/nginx/${domain}-error.log" \
--failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: <HOST>, .*https://$domain${path%/}/admin/auth.php"
#=================================================
# END OF SCRIPT

9
scripts/upgrade
View file

@ -62,14 +62,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading source files..."
# Download, check integrity, uncompress and patch the source from app.src
# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r)
if ! curl --output /dev/null --silent --head --fail "$src_url"; then
ynh_setup_source --dest_dir="$install_dir" --source_id="attic"
else
ynh_setup_source --dest_dir="$install_dir" --source_id="latest"
fi
_dotclear2_setup_source
fi
chmod -R o-rwx "$install_dir"