diff --git a/.gitignore b/.gitignore index d801fbf..557d2c3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ node_modules/ .env .env.* dist/ -push.sh diff --git a/code/.gitignore b/code/.gitignore index 63f39de..557d2c3 100644 --- a/code/.gitignore +++ b/code/.gitignore @@ -2,4 +2,3 @@ node_modules/ .env .env.* dist/ -gitup.sh diff --git a/code/gitup.sh b/code/gitup.sh deleted file mode 100755 index fb01f66..0000000 --- a/code/gitup.sh +++ /dev/null @@ -1,18 +0,0 @@ -set -a -source .env -set +a - -cd ~/sergay || exit 1 -git rebase --continue - -git add . - -if ! git diff --cached --quiet; then - git commit -m "update" || exit 1 -else - echo "Нет новых изменений" -fi - -git pull --rebase "https://gitek.duckdns.org/igor/sergay.git" main || exit 1 -git push "https://igor:${GIT}@gitek.duckdns.org/igor/sergay.git" -cp /root/sergay/code/sergay.json /root/api/sergay.json diff --git a/push.sh b/push.sh new file mode 100644 index 0000000..95fdf8b --- /dev/null +++ b/push.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# Цвета для красоты +GREEN='\033[0;32m' +BLUE='\033[0;34m' +NC='\033[0m' # No Color + +echo -e "${BLUE}===> Добавляем изменения...${NC}" +git add . + +# Проверяем, передан ли коммит в аргументах +if [ -z "$1" ] + then + msg="Update $(date +'%Y-%m-%d %H:%M:%S')" + else + msg="$1" +fi + +echo -e "${BLUE}===> Коммитим: ${GREEN}$msg${NC}" +git commit -m "$msg" + +echo -e "${BLUE}===> Пушим на Gitek...${NC}" +git push gitek main + +echo -e "${BLUE}===> Пушим на GitHub...${NC}" +git push github main + +echo -e "${GREEN}Готово! Код обновлен в обоих репозиториях.${NC}"