From 2de27d958eb3160b36df218b25c36455d5b5a0e3 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 9 Apr 2019 17:51:25 +0200 Subject: Revert back to argon2i --- depends/dchat_core | 2 +- install.sh | 22 ---------------------- install.sh.bak | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 23 deletions(-) delete mode 100755 install.sh create mode 100755 install.sh.bak diff --git a/depends/dchat_core b/depends/dchat_core index 5357550..6b46f7e 160000 --- a/depends/dchat_core +++ b/depends/dchat_core @@ -1 +1 @@ -Subproject commit 53575506d44cee3a1295410dbc4d29c76a957ee4 +Subproject commit 6b46f7eccda2fd415727f731f655c6f03d9f9be5 diff --git a/install.sh b/install.sh deleted file mode 100755 index 7023db3..0000000 --- a/install.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -set -e - -cd "$(dirname "$0")" -sibs build --release -chmod +x ./sibs-build/release/dchat - -dchat_resource_dir=~/.local/share/dchat/resources -desktop_file=~/.local/share/applications/dchat.desktop -mkdir -p ~/.local/bin -mkdir -p ~/.local/share/applications -mkdir -p ${dchat_resource_dir} - -target_path=~/.local/bin/dchat -cp ./sibs-build/release/dchat $target_path -cp ./dchat.desktop ${desktop_file} -sed -i "s;DCHAT_BIN_PATH;${target_path};g" ${desktop_file} -sed -i "s;DCHAT_RESOURCES_PATH;${dchat_resource_dir};g" ${desktop_file} -cp -r ./shaders "${dchat_resource_dir}/shaders" -cp -r ./fonts "${dchat_resource_dir}/fonts" -echo "Installed dchat to directory $target_path" diff --git a/install.sh.bak b/install.sh.bak new file mode 100755 index 0000000..7023db3 --- /dev/null +++ b/install.sh.bak @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +cd "$(dirname "$0")" +sibs build --release +chmod +x ./sibs-build/release/dchat + +dchat_resource_dir=~/.local/share/dchat/resources +desktop_file=~/.local/share/applications/dchat.desktop +mkdir -p ~/.local/bin +mkdir -p ~/.local/share/applications +mkdir -p ${dchat_resource_dir} + +target_path=~/.local/bin/dchat +cp ./sibs-build/release/dchat $target_path +cp ./dchat.desktop ${desktop_file} +sed -i "s;DCHAT_BIN_PATH;${target_path};g" ${desktop_file} +sed -i "s;DCHAT_RESOURCES_PATH;${dchat_resource_dir};g" ${desktop_file} +cp -r ./shaders "${dchat_resource_dir}/shaders" +cp -r ./fonts "${dchat_resource_dir}/fonts" +echo "Installed dchat to directory $target_path" -- cgit v1.2.3