From 7343e89a1772ee7c5f15ad12b23c4195101c16c3 Mon Sep 17 00:00:00 2001
From: Andrey Zimin <zimin@chatlanin.com.ru>
Date: Sun, 10 Mar 2024 13:30:01 +0300
Subject: [PATCH] fix path to dir

---
 PKGBUILD           |  8 ++++----
 makepkg.sh         | 14 +++++++++++++-
 misc/.zshrc        |  3 +++
 tarch-misc.install | 41 +++++++++++++++++++++++++----------------
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 00f4128..a7b2737 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@ pkgname=tarch-misc
 pkgver=1.0
 pkgrel=1
 pkgdesc="Home config file for Tarch OS"
-arch=('any')
-url="https://gitcast.ru/tarch_os/tarch-misc.git"
-license=('GPL3')
+arch=("any")
+url="https://gitcast.ru/tarch_os/tarch-bin"
+license=("GPL3")
 install=${pkgname}.install
 
 prepare() {
@@ -15,7 +15,7 @@ package() {
 	local SKEL_DIR=${pkgdir}/etc/skel
 	mkdir -p ${SKEL_DIR}
 	
-	cp -r ${srcdir}/.Xresources.d 	${SKEL_DIR}
+	cp -r ${srcdir}/.Xresources.d	${SKEL_DIR}
 	
 	install -Dm 644 ${srcdir}/.dmrc 	     ${SKEL_DIR}/.dmrc
 	install -Dm 644 ${srcdir}/.face 		   ${SKEL_DIR}/.face
diff --git a/makepkg.sh b/makepkg.sh
index 4c0b4e4..642616c 100755
--- a/makepkg.sh
+++ b/makepkg.sh
@@ -1,6 +1,18 @@
 #!/bin/bash
 
-source "$HOME/bin/scripts/system/style"
+RESET_COLOR="\033[0m"
+BOLD="\033[1m"
+ITALIC="\033[3m"
+
+BLACK="\033[30m"
+RED="\033[31m"
+GREEN="\033[32m"
+YELLOW="\033[33m"
+BLUE="\033[34m"
+MAGENTA="\033[35m"
+CYAN="\033[36m"
+WHITE="\033[37m"
+PURPLE="\033[35m"
 
 BUILDING_DIR="build"
 
diff --git a/misc/.zshrc b/misc/.zshrc
index d9edf5a..5fbbb58 100644
--- a/misc/.zshrc
+++ b/misc/.zshrc
@@ -71,6 +71,9 @@ alias nv="nvim"
 
 alias ls="lst"
 
+# run sonic-annotator
+alias sonic-anotator="/home/$USER/vamp/sonic-annotator"
+
   # # # # # # #
  # SETTINGS #
 # # # # # #
diff --git a/tarch-misc.install b/tarch-misc.install
index 5d0be18..947ea1e 100644
--- a/tarch-misc.install
+++ b/tarch-misc.install
@@ -1,13 +1,25 @@
 #!/bin/bash
 
-source "$HOME/bin/scripts/system/style"
+RESET_COLOR="\033[0m"
+BOLD="\033[1m"
+ITALIC="\033[3m"
+
+BLACK="\033[30m"
+RED="\033[31m"
+GREEN="\033[32m"
+YELLOW="\033[33m"
+BLUE="\033[34m"
+MAGENTA="\033[35m"
+CYAN="\033[36m"
+WHITE="\033[37m"
+PURPLE="\033[35m"
 
 USER=`echo ${SUDO_USER:-$(whoami)}`
 GID=`echo ${SUDO_GID}`
 GROUB=`cat /etc/group | grep ${GID} | cut -d: -f1 | head -1`
-HOME_DIR="home/${USER}"
-BACKUP_DIR="/home/${HOME_DIR}/.tarch-backups"
-CONFIG_DIR_SKEL="/etc/skel"
+HOME_DIR="/home/${USER}"
+BACKUP_DIR="${HOME_DIR}/.tarch-backups"
+SKEL_DIR="/etc/skel"
 PKG_NAME="tarch-misc"
 
 BACKUP (){
@@ -18,7 +30,6 @@ BACKUP (){
 	mkdir -p ${BACKUP_DIR}/${FILES_NAME}-${BACKUP_NAME}-${BACKUP_RANDOM}
 
 	echo -e ${CYAN}"   ==> перемещаем текущий конфиг в backup дирректорию." ${RESET_COLOR}
-	mv ${HOME_DIR}/.mplayer ${BACKUP_DIR}/${FILES_NAME}-${BACKUP_NAME}-${BACKUP_RANDOM}
 	mv ${HOME_DIR}/.Xresources.d ${BACKUP_DIR}/${FILES_NAME}-${BACKUP_NAME}-${BACKUP_RANDOM}
 	mv ${HOME_DIR}/.dmrc ${BACKUP_DIR}/${FILES_NAME}-${BACKUP_NAME}-${BACKUP_RANDOM}
 	mv ${HOME_DIR}/.face ${BACKUP_DIR}/${FILES_NAME}-${BACKUP_NAME}-${BACKUP_RANDOM}
@@ -38,18 +49,16 @@ INSTALL (){
 
 	mkdir -p ${HOME_DIR}
 
-	cp -rf ${HOME_DIR_SKEL}/.mplayer ${HOME_DIR}
-	cp -rf ${HOME_DIR_SKEL}/.Xresources.d ${HOME_DIR}
-	cp ${HOME_DIR_SKEL}/.dmrc ${HOME_DIR}
-	cp ${HOME_DIR_SKEL}/.face ${HOME_DIR}
-	cp ${HOME_DIR_SKEL}/.gtkrc-2.0 ${HOME_DIR}
-	cp ${HOME_DIR_SKEL}/.hushlogin ${HOME_DIR}
-	cp ${HOME_DIR_SKEL}/.p10k.zsh ${HOME_DIR}
-	cp ${HOME_DIR_SKEL}/.Xresources ${HOME_DIR}
-	cp ${HOME_DIR_SKEL}/.zshrc ${HOME_DIR}
+	cp -rf ${SKEL_DIR}/.Xresources.d ${HOME_DIR}
+	cp ${SKEL_DIR}/.dmrc ${HOME_DIR}
+	cp ${SKEL_DIR}/.face ${HOME_DIR}
+	cp ${SKEL_DIR}/.gtkrc-2.0 ${HOME_DIR}
+	cp ${SKEL_DIR}/.hushlogin ${HOME_DIR}
+	cp ${SKEL_DIR}/.p10k.zsh ${HOME_DIR}
+	cp ${SKEL_DIR}/.Xresources ${HOME_DIR}
+	cp ${SKEL_DIR}/.zshrc ${HOME_DIR}
 
   echo -e ${CYAN}"   ==> предоставление разрешений для пользователя: ${PURPLE}${USER}" ${RESET_COLOR}
-  chown -R ${USER}:${GROUB} ${HOME_DIR}/.mplayer
   chown -R ${USER}:${GROUB} ${HOME_DIR}/.Xresources.d
   chown -R ${USER}:${GROUB} ${HOME_DIR}/.dmrc
   chown -R ${USER}:${GROUB} ${HOME_DIR}/.face
@@ -59,7 +68,7 @@ INSTALL (){
   chown -R ${USER}:${GROUB} ${HOME_DIR}/.Xresources
   chown -R ${USER}:${GROUB} ${HOME_DIR}/.zshrc
 	
-	if [[ -d "${HOME_DIR}/.mplayer" && -d "${HOME_DIR}/.Xresources.d" && -f "${HOME_DIR}/.dmrc" && -f "${HOME_DIR}/.face" && -f "${HOME_DIR}/.fehbg" && -f "${HOME_DIR}/.gtkrc-2.0" && -f "${HOME_DIR}/.hushlogin" && -f "${HOME_DIR}/.p10k.zsh" && -f "${HOME_DIR}/.Xresources" && -f "${HOME_DIR}/.xsettingsd" && -f "${HOME_DIR}/.zshrc" ]]; then
+	if [[ -d "${HOME_DIR}/.Xresources.d" && -f "${HOME_DIR}/.dmrc" && -f "${HOME_DIR}/.face" && -f "${HOME_DIR}/.fehbg" && -f "${HOME_DIR}/.gtkrc-2.0" && -f "${HOME_DIR}/.hushlogin" && -f "${HOME_DIR}/.p10k.zsh" && -f "${HOME_DIR}/.Xresources" && -f "${HOME_DIR}/.xsettingsd" && -f "${HOME_DIR}/.zshrc" ]]; then
     echo -e ${BOLD}${GREEN}"[✔] конфигурационные файлы установлены..." ${RESET_COLOR}
     echo -e "\n"
 	else