correctiong errors

master
Kerem Yollu 2 years ago
parent 512546d03d
commit c4804337ca

@ -12,7 +12,7 @@ source $MAIN_DIR/programs/obsidian/obsidian.sh
DOTFILE_DIR=$MAIN_DIR/dotfiles DOTFILE_DIR=$MAIN_DIR/dotfiles
USER_DOTFILE_DIR=/home/$USER/.config USER_DOTFILE_DIR=/home/$USER/.config
FONTS_DIR="/usr/local/share/fonts" FONTS_DIR="/usr/share/fonts"
WALLPAPERS_DIR="/home/$USER" WALLPAPERS_DIR="/home/$USER"
CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo) CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo)
@ -23,7 +23,7 @@ sleepTime=0.2
# Declaration of OS and their package managers # Declaration of OS and their package managers
os_list=(debian arch raspberry) os_list=(debian arch raspberry)
pckgmngr_list=('sudo apt -y install' 'yes | sudo pacman -S' 'sudo apt -y install') pckgmngr_list=('sudo apt -y install' 'sudo pacman -S' 'sudo apt -y install')
# Declaration of common packages and their config files forr al linux distros # Declaration of common packages and their config files forr al linux distros
# These pacakges must be found in the standart repositories # These pacakges must be found in the standart repositories

@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
ALACRITTY_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) ALACRITTY_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
alacritty_req_list_debian=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev) alacritty_req_list_debian=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev)
alacritty_req_list_arch=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev) alacritty_req_list_arch=(cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev)
@ -41,8 +40,7 @@ alacritty_install_core()
cd alacritty/ cd alacritty/
cargo build --release -j$CPU_CORE_COUNT cargo build --release -j$CPU_CORE_COUNT
sudo cp target/release/alacritty /usr/local/bin sudo cp target/release/alacritty /usr/local/bin
sudo cp extra/logo/alacritty-term.svg /usr/share/pixmaps/Alacritty.svg sudo cp extra/logo/alacritty-term.svg /usr/share/pixmaps/Alacritty.svg
cd .. cd ..
sudo rm -r alacritty/ sudo rm -r alacritty/
} }
@ -66,13 +64,11 @@ install_alacritty()
cd $ALACRITTY_SCRIPT_DIR cd $ALACRITTY_SCRIPT_DIR
mkdir -p $USER_DOTFILE_DIR/alacritty
case $OS in case $OS in
debian) debian)
install_from_list "${alacritty_req_list_debian[@]}" install_from_list "${alacritty_req_list_debian[@]}"
alacritty_install_core
echo "cp -r $DOTFILE_DIR/alacritty/alacritty_$PLATFORM.yml $USER_DOTFILE_DIR/alacritty/alacritty.yml"
alacritty_set_opacity
alacritty_set_font_size
;; ;;
arch) arch)
@ -88,7 +84,11 @@ install_alacritty()
exit_abord exit_abord
;; ;;
esac esac
alacritty_install_core
cp $DOTFILE_DIR/alacritty/alacritty_$PLATFORM.yml $USER_DOTFILE_DIR/alacritty/alacritty.yml
alacritty_set_opacity
alacritty_set_font_size
outro outro
} }

@ -15,8 +15,7 @@ dmenu_set_font_size()
intro() intro()
{ {
graphics_install_prompt "Dmenu verison : $version Will be installed" graphics_install_prompt "Dmenu verison : $version Will be installed"
color_start "themeIndication" color_start "themeIndication"
echo "Currently used mods are :" echo "Currently used mods are :"
ls | grep -oP '.*diff' ls | grep -oP '.*diff'
@ -33,7 +32,6 @@ install_dmenu()
{ {
intro intro
echo "demnu location $DMENU_SCRIPT_DIR" echo "demnu location $DMENU_SCRIPT_DIR"
cd $DMENU_SCRIPT_DIR/dmenu_5.2/
case $OS in case $OS in
debian) debian)
dmenu_set_font_size dmenu_set_font_size

@ -5,8 +5,8 @@ static int topbar = 1; /* -b option; if 0, dmenu appears a
static const unsigned int alpha = 0xf0; static const unsigned int alpha = 0xf0;
/* -fn option overrides fonts[0]; default X11 font or font set */ /* -fn option overrides fonts[0]; default X11 font or font set */
static const char *fonts[] = { static const char *fonts[] = {
//"monospace:size=24 //"monospace:size=
"xft:Ubuntu:weight=bold:pixelsize=24antialias=true:hinting=true" "xft:Ubuntu:weight=bold:pixelsize=24tialias=true:hinting=true"
}; };
static const char *prompt = NULL; /* -p option; prompt to the left of input field */ static const char *prompt = NULL; /* -p option; prompt to the left of input field */

@ -7,7 +7,6 @@ awsomeFont="https://use.fontawesome.com/releases/v6.2.1/fontawesome-free-6.2.1-d
intro() intro()
{ {
cd $FONTS_SCRIPT_DIR
graphics_install_prompt "Following Fonts Will be installed" graphics_install_prompt "Following Fonts Will be installed"
graphics_install_prompt "$sourceCodePro" graphics_install_prompt "$sourceCodePro"
graphics_install_prompt "$awsomeFont" graphics_install_prompt "$awsomeFont"
@ -30,6 +29,9 @@ outro()
install_fonts() install_fonts()
{ {
intro intro
cd $FONTS_SCRIPT_DIR
git clone $sourceCodePro git clone $sourceCodePro
if [[ -d "$FONTS_DIR/source-code-pro" ]] if [[ -d "$FONTS_DIR/source-code-pro" ]]
@ -47,6 +49,7 @@ install_fonts()
wget $awsomeFont wget $awsomeFont
unzip *.zip unzip *.zip
rm *.zip rm *.zip
dir=$(find . -mindepth 1 -maxdepth 1 -type d) dir=$(find . -mindepth 1 -maxdepth 1 -type d)
if [[ -d "$FONTS_DIR/fontawesome" ]] if [[ -d "$FONTS_DIR/fontawesome" ]]

@ -3,28 +3,10 @@
INSTALL_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) INSTALL_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
source $INSTALL_SCRIPT_DIR/config.sh source $INSTALL_SCRIPT_DIR/config.sh
source $INSTALL_SCRIPT_DIR/programs/dmenu/dmenu.sh
source $INSTALL_SCRIPT_DIR/../scripts/graphics.sh source $INSTALL_SCRIPT_DIR/../scripts/graphics.sh
source $INSTALL_SCRIPT_DIR/../scripts/check_installed.sh source $INSTALL_SCRIPT_DIR/../scripts/check_installed.sh
install_from_list() OS="arch"
{ CPU_CORE_COUNT=17
theList=("$@") install_dmenu
graphics_indication "Common installations these programs are OS independent from"
for i in "${!theList[@]}";
do
currentProg=${theList[$i]}
if [ $( check_installed $currentProg ) -eq 0 ]
then
echo "installing $currentProg"
else
echo "skipping $currentProg"
fi
done
}
OS="debian"
buff="default_installs_$OS"
listToinstall='${'$buff'[@]}'
echo $listToinstall
install_from_list '${'$buff'[@]}'

Loading…
Cancel
Save