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

Merge pull request #81 from YunoHost-Apps/testing

Browse source 
Simpler sha1 computation (#80)
This commit is contained in:
yalh76 2022-09-05 19:37:06 +02:00 • committed by GitHub
commit 445198c4c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -30,7 +30,8 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i
- feed other blogs, aggregators, social networks... - feed other blogs, aggregators, social networks...
**Shipped version:** 0.12.1~ynh4 **Shipped version:** 0.12.1~ynh5
**Demo:** https://demo.shaarli.org/ **Demo:** https://demo.shaarli.org/

3
README_fr.md
View file

@ -30,7 +30,8 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i
- feed other blogs, aggregators, social networks... - feed other blogs, aggregators, social networks...
**Version incluse :** 0.12.1~ynh4 **Version incluse :** 0.12.1~ynh5
**Démo :** https://demo.shaarli.org/ **Démo :** https://demo.shaarli.org/

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "The personal, minimalist, super-fast, no-database delicious clone", "en": "The personal, minimalist, super-fast, no-database delicious clone",
"fr": "Clone de delicious, rapide, simple et sans base de données" "fr": "Clone de delicious, rapide, simple et sans base de données"
}, },
"version": "0.12.1~ynh4", "version": "0.12.1~ynh5",
"url": "https://github.com/shaarli/Shaarli", "url": "https://github.com/shaarli/Shaarli",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",

2
scripts/install
View file

@ -110,7 +110,7 @@ timezone=$(cat /etc/timezone)
salt=$(php$phpversion -r 'echo sha1(uniqid("", true) ."_". mt_rand());') salt=$(php$phpversion -r 'echo sha1(uniqid("", true) ."_". mt_rand());')
# Generate the hash with the password # Generate the hash with the password
hash=$(php$phpversion -r "echo sha1('${password}'.'${admin}'.'${salt}');") hash=$(echo -n "${password}${admin}${salt}" | sha1sum | awk '{print $1}')
# Generate the API secret # Generate the API secret
secret=$(php${YNH_PHP_VERSION} -r "echo str_shuffle(substr(hash_hmac('sha512', uniqid('${salt}'), '${admin}'), 10, 12));") secret=$(php${YNH_PHP_VERSION} -r "echo str_shuffle(substr(hash_hmac('sha512', uniqid('${salt}'), '${admin}'), 10, 12));")