From 297b38e371aea342a88a14284e639cbf1e39b357 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Fri, 10 Aug 2018 14:59:24 +0200
Subject: [PATCH] Remove legacy local helper file

---
 scripts/_common.sh  |  1 +
 scripts/_helpers.sh | 78 ---------------------------------------------
 scripts/install     |  8 +----
 scripts/remove      |  8 +----
 scripts/upgrade     |  8 +----
 5 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 scripts/_helpers.sh

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 38f4bca..51ef84d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # Common variables
 #
diff --git a/scripts/_helpers.sh b/scripts/_helpers.sh
deleted file mode 100644
index b8055d9..0000000
--- a/scripts/_helpers.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Yunohost helpers
-#
-
-ynh_die() {
-  echo "$1" 1>&2
-  exit "${2:-1}"
-}
-
-ynh_user_exists() {
-    sudo yunohost user info $admin
-}
-
-ynh_system_user_exists() {
-    getent passwd "$1" &>/dev/null
-}
-
-ynh_app_setting_get() {
-    sudo yunohost app setting "$1" "$2"
-}
-
-ynh_app_setting_set() {
-    sudo yunohost app setting "$1" "$2" -v "$3"
-}
-
-ynh_app_setting_delete() {
-    sudo yunohost app setting -d "$1" "$2"
-}
-
-ynh_string_random() {
-    dd if=/dev/urandom bs=1 count=200 2> /dev/null \
-      | tr -c -d '[A-Za-z0-9]' \
-      | sed -n 's/\(.\{'"${1:-24}"'\}\).*/\1/p'
-}
-
-MYSQL_ROOT_PWD_FILE=/etc/yunohost/mysql
-
-ynh_mysql_create_db() {
-    db=$1
-
-    sql="CREATE DATABASE ${db};"
-
-    # grant all privilegies to user
-    if [[ $# -gt 1 ]]; then
-        sql+=" GRANT ALL PRIVILEGES ON ${db}.* TO '${2}'@'localhost'"
-        [[ -n ${3:-} ]] && sql+=" IDENTIFIED BY '${3}'"
-        sql+=" WITH GRANT OPTION;"
-    fi
-
-    ynh_mysql_execute_as_root "$sql"
-}
-
-ynh_mysql_drop_db() {
-    ynh_mysql_execute_as_root "DROP DATABASE ${1};"
-}
-
-ynh_mysql_drop_user() {
-    ynh_mysql_execute_as_root "DROP USER '${1}'@'localhost';"
-}
-
-ynh_mysql_execute_as_root() {
-    ynh_mysql_connect_as "root" "$(sudo cat $MYSQL_ROOT_PWD_FILE)" \
-        "${2:-}" <<< "$1"
-}
-
-ynh_mysql_connect_as() {
-    mysql -u "$1" --password="$2" -B "${3:-}"
-}
-
-
-ynh_package_install() {
-    ynh_apt -o Dpkg::Options::=--force-confdef \
-            -o Dpkg::Options::=--force-confold install $@
-}
-
-ynh_apt() {
-    DEBIAN_FRONTEND=noninteractive sudo apt-get -y -qq $@
-}
diff --git a/scripts/install b/scripts/install
index 26da454..d29d3b9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -18,13 +18,7 @@ timezone=`cat /etc/timezone`
 # Source local helpers
 source ./_common.sh
 
-# Source YunoHost helpers if exists.
-# If not, source backported helpers from file.
-if [ -a "/usr/share/yunohost/helpers" ]; then
-  source /usr/share/yunohost/helpers
-else
-  source ./_helpers.sh
-fi
+source /usr/share/yunohost/helpers
 
 # Check domain/path availability
 sudo yunohost app checkurl "${domain}${path}" -a "$app" \
diff --git a/scripts/remove b/scripts/remove
index 9294d00..91866fb 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -5,13 +5,7 @@ app="movim"
 # Source local helpers
 source ./_common.sh
 
-# Source YunoHost helpers if exists.
-# If not, source backported helpers from file.
-if [ -a "/usr/share/yunohost/helpers" ]; then
-  source /usr/share/yunohost/helpers
-else
-  source ./_helpers.sh
-fi
+source /usr/share/yunohost/helpers
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
diff --git a/scripts/upgrade b/scripts/upgrade
index 701026d..61a4a08 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -8,13 +8,7 @@ app="movim"
 # Source local helpers
 source ./_common.sh
 
-# Source YunoHost helpers if exists.
-# If not, source backported helpers from file.
-if [ -a "/usr/share/yunohost/helpers" ]; then
-  source /usr/share/yunohost/helpers
-else
-  source ./_helpers.sh
-fi
+source /usr/share/yunohost/helpers
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)