diff --git a/README.md b/README.md index 46da2a6..9e8ae69 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,8 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i - feed other blogs, aggregators, social networks... -**Shipped version:** 0.12.1~ynh4 +**Shipped version:** 0.12.1~ynh5 + **Demo:** https://demo.shaarli.org/ diff --git a/README_fr.md b/README_fr.md index 795a922..06badff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,8 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i - feed other blogs, aggregators, social networks... -**Version incluse :** 0.12.1~ynh4 +**Version incluse :** 0.12.1~ynh5 + **Démo :** https://demo.shaarli.org/ diff --git a/manifest.json b/manifest.json index a002ecd..771fb2a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "The personal, minimalist, super-fast, no-database delicious clone", "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", "upstream": { "license": "MIT", diff --git a/scripts/install b/scripts/install index f0dc3e6..c1be818 100644 --- a/scripts/install +++ b/scripts/install @@ -110,7 +110,7 @@ timezone=$(cat /etc/timezone) salt=$(php$phpversion -r 'echo sha1(uniqid("", true) ."_". mt_rand());') # 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 secret=$(php${YNH_PHP_VERSION} -r "echo str_shuffle(substr(hash_hmac('sha512', uniqid('${salt}'), '${admin}'), 10, 12));")