From 24291d2f3253eb474841d633de5f115d0190392b Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Wed, 18 Mar 2020 21:02:26 +0000 Subject: [PATCH] wolo? --- dev-server.sh | 10 +++++++++- globals/post_options.js | 0 src/@ycore/libs/comty_layout/pre.js | 0 src/components/Layout/Secondary.js | 0 src/components/Layout/Secondary.less | 0 src/components/Layout/SecondaryHeader.js | 0 .../PostCreator/local_components/post_options.js | 0 .../PostCreator/local_components/post_options.less | 0 src/pages/g/$group/index.js | 0 src/pages/g/$group/styles.less | 0 src/pages/p/$post/index.js | 0 src/pages/pro/index.js | 0 src/pages/settings/components/earnings.js | 0 src/pages/settings/components/notification.less | 0 src/pages/settings/components/security.less | 0 15 files changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 globals/post_options.js mode change 100644 => 100755 src/@ycore/libs/comty_layout/pre.js mode change 100644 => 100755 src/components/Layout/Secondary.js mode change 100644 => 100755 src/components/Layout/Secondary.less mode change 100644 => 100755 src/components/Layout/SecondaryHeader.js mode change 100644 => 100755 src/components/PostCreator/local_components/post_options.js mode change 100644 => 100755 src/components/PostCreator/local_components/post_options.less mode change 100644 => 100755 src/pages/g/$group/index.js mode change 100644 => 100755 src/pages/g/$group/styles.less mode change 100644 => 100755 src/pages/p/$post/index.js mode change 100644 => 100755 src/pages/pro/index.js mode change 100644 => 100755 src/pages/settings/components/earnings.js mode change 100644 => 100755 src/pages/settings/components/notification.less mode change 100644 => 100755 src/pages/settings/components/security.less diff --git a/dev-server.sh b/dev-server.sh index d3d95781..1dc991f4 100755 --- a/dev-server.sh +++ b/dev-server.sh @@ -20,6 +20,11 @@ stop_dev(){ show_logs(){ sudo journalctl -u comty_dev } +update(){ + git reset --merge&&git fetch --all&&git reset --hard origin/master + + +} show_menus() { clear @@ -30,18 +35,21 @@ show_menus() { echo "2. Start Server" echo "3. Stop Server" echo "4. Show DevServer Logs" + echo "5. Update from Git" + echo "" echo "0. Exit" } read_options(){ local choice - read -p "Enter choice [ 1 - 4 ] " choice + read -p "Enter choice [ 1 - 5 ] " choice case $choice in 0) exit 0;; 1) start_cli_dev ;; 2) start_dev ;; 3) stop_dev ;; 4) show_logs;; + 5) update;; *) echo -e "${RED}Error...${STD}" && sleep 2 esac } diff --git a/globals/post_options.js b/globals/post_options.js old mode 100644 new mode 100755 diff --git a/src/@ycore/libs/comty_layout/pre.js b/src/@ycore/libs/comty_layout/pre.js old mode 100644 new mode 100755 diff --git a/src/components/Layout/Secondary.js b/src/components/Layout/Secondary.js old mode 100644 new mode 100755 diff --git a/src/components/Layout/Secondary.less b/src/components/Layout/Secondary.less old mode 100644 new mode 100755 diff --git a/src/components/Layout/SecondaryHeader.js b/src/components/Layout/SecondaryHeader.js old mode 100644 new mode 100755 diff --git a/src/components/PostCreator/local_components/post_options.js b/src/components/PostCreator/local_components/post_options.js old mode 100644 new mode 100755 diff --git a/src/components/PostCreator/local_components/post_options.less b/src/components/PostCreator/local_components/post_options.less old mode 100644 new mode 100755 diff --git a/src/pages/g/$group/index.js b/src/pages/g/$group/index.js old mode 100644 new mode 100755 diff --git a/src/pages/g/$group/styles.less b/src/pages/g/$group/styles.less old mode 100644 new mode 100755 diff --git a/src/pages/p/$post/index.js b/src/pages/p/$post/index.js old mode 100644 new mode 100755 diff --git a/src/pages/pro/index.js b/src/pages/pro/index.js old mode 100644 new mode 100755 diff --git a/src/pages/settings/components/earnings.js b/src/pages/settings/components/earnings.js old mode 100644 new mode 100755 diff --git a/src/pages/settings/components/notification.less b/src/pages/settings/components/notification.less old mode 100644 new mode 100755 diff --git a/src/pages/settings/components/security.less b/src/pages/settings/components/security.less old mode 100644 new mode 100755