From a34ddfe26e5d57d5cb90a19b8a022aa9994993a4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 13 Oct 2021 15:54:00 +0200 Subject: [PATCH] Fix --- conf/go.src | 7 ------- scripts/install | 28 +++++----------------------- 2 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 conf/go.src diff --git a/conf/go.src b/conf/go.src deleted file mode 100644 index 03b9985..0000000 --- a/conf/go.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://golang.org/dl/go1.15.8.linux-amd64.tar.gz -SOURCE_SUM=d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/scripts/install b/scripts/install index 39e02db..ece0d73 100644 --- a/scripts/install +++ b/scripts/install @@ -163,35 +163,17 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=2 # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# INSTALL MMCTL -#================================================= - -# Install Go if needed -if ! command -v /usr/local/go/bin/go &> /dev/null -then - ynh_script_progression --message="Installing Go dependency... (this will take some time)" --weight=3 - ynh_setup_source --source_id="go" --dest_dir="/usr/local/" -fi - -export PATH=$PATH:/usr/local/go/bin -env_path=$PATH - -go get -u github.com/mattermost/mmctl - -source <(mmctl completion bash) - #================================================= # CREATE ADMIN AND FIRST TEAM #================================================= team_name=$(echo "$team_display_name" | iconv -f utf8 -t ascii//TRANSLIT//IGNORE | sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z) -pushd "$final_path" - ynh_exec_warn_less ynh_exec_as $app bin/mattermost mmctl user create --username "$admin" --email "$email" --password "$password" --locale "$language" --system_admin - ynh_exec_warn_less ynh_exec_as $app bin/mattermost mmctl user verify "$admin" - ynh_exec_warn_less ynh_exec_as $app bin/mattermost mmctl team create --name "$team_name" --display_name "$team_display_name" --email "$email" - ynh_exec_warn_less ynh_exec_as $app bin/mattermost mmctl team add "$team_name" "$admin" +pushd "$final_path/bin" + ynh_exec_warn_less ynh_exec_as $app mmctl user create --username "$admin" --email "$email" --password "$password" --locale "$language" --system_admin + ynh_exec_warn_less ynh_exec_as $app mmctl user verify "$admin" + ynh_exec_warn_less ynh_exec_as $app mmctl team create --name "$team_name" --display_name "$team_display_name" --email "$email" + ynh_exec_warn_less ynh_exec_as $app mmctl team add "$team_name" "$admin" popd #=================================================