correctiong errors intro and outro

setup/config.sh

@@ -28,6 +28,7 @@ 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
 # These pacakges must be found in the standart repositories
 common_programs_list=(htop tmux git fish mc wget sudo unzip cmake make gcc exa scrot)
+
 common_dotfile_list=(fish)
 
 # Declaration of common default installations but for different OS
@@ -40,8 +41,7 @@ default_installs_raspberry=(chromium)
 # Their instalation methodes can differ depending of the distribution
 # These pacakges must not be found in the standart repositories and can be gits or direct installs
 custom_installs_debian=(dmenu fonts alacritty wallpaper picom obsidian)
-#custom_installs_debian=(obsidian)
+custom_installs_arch=(dmenu fonts alacritty wallpaper picom obsidian)
-custom_installs_arch=(dmenu fonts alacritty wallpaper picom)
 custom_installs_raspberry=(dmenu fonts alacritty wallpaper picom)
 
 

setup/programs/alacritty/alacritty.sh

@@ -45,22 +45,11 @@ alacritty_install_core()
 	sudo rm -r alacritty/
 }
 
-intro()
-{
-	graphics_install_prompt "Allacritty Will be installed"
-	graphics_install_prompt "Source: $alacritty_source"
-}
-
-outro()
-{
-	graphics_install_prompt "Alacritty installation complete"
-	cd $MAIN_DIR
-}
-
 
 install_alacritty()
 {
-	intro
+	graphics_install_prompt "Allacritty Will be installed"
+	graphics_install_prompt "Source: $alacritty_source"
 
 	cd $ALACRITTY_SCRIPT_DIR
 
@@ -90,5 +79,6 @@ install_alacritty()
 	alacritty_set_opacity
 	alacritty_set_font_size	
 
-	outro
+	graphics_install_prompt "Alacritty installation complete"
+	cd $MAIN_DIR
 }

setup/programs/dmenu/dmenu.sh

@@ -13,24 +13,14 @@ dmenu_set_font_size()
 	sed -i -e  "s/size=../size=$fontSize/g" config.h
 }
 
-intro()
+install_dmenu()
 {
 	graphics_install_prompt "Dmenu verison : $version  Will be installed"	
 	color_start "themeIndication"
 	echo "Currently used mods are :"
 	ls | grep -oP '.*diff'
 	color_stop	
-}
 
-outro()
-{
-	graphics_install_prompt "Dmenu installation complete"
-	cd $MAIN_DIR
-}
-
-install_dmenu()
-{
-	intro
 	echo "demnu location $DMENU_SCRIPT_DIR"
 	case $OS in
 	  debian)
@@ -54,5 +44,6 @@ install_dmenu()
 		;;
 	esac
 
-	outro
+	graphics_install_prompt "Dmenu installation complete"
+	cd $MAIN_DIR
 }

setup/programs/fonts/fonts.sh

@@ -5,7 +5,7 @@ FONTS_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null &&
 sourceCodePro="https://github.com/adobe-fonts/source-code-pro"
 awsomeFont="https://use.fontawesome.com/releases/v6.2.1/fontawesome-free-6.2.1-desktop.zip"
 
-intro()
+fonts_intro()
 {
 	graphics_install_prompt "Following Fonts Will be installed"
 	graphics_install_prompt "$sourceCodePro"
@@ -20,7 +20,7 @@ intro()
 	fi
 }
 
-outro()
+fonts_outro()
 {
 	graphics_install_prompt "fonts installation complete"
 	cd $MAIN_DIR
@@ -28,7 +28,7 @@ outro()
 
 install_fonts()
 {
-	intro
+	fonts_intro
 	
 	cd $FONTS_SCRIPT_DIR
 	
@@ -64,5 +64,5 @@ install_fonts()
 	sudo chmod -R 555 $FONTS_DIR/fontawesome
 	rm -r $dir
 	fc-cache -v
-	outro
+	fonts_outro
 }

setup/programs/obsidian/obsidian.sh

@@ -5,43 +5,39 @@ obsidianSource="https://github.com/obsidianmd/obsidian-releases/releases/downloa
 obsidianInstallDir="/home/$USER/obsidian"
 obsidianRep="https://git.keydev.me/kerem/infoVault"
 
-intro()
+install_obsidian()
 {
 	graphics_install_prompt "Obsidian Will be installed"
 	graphics_install_prompt "Source : $obsidianSource"
-}
-
-outro()
-{
-	graphics_install_prompt "Obsidian installation complete"
-	cd $MAIN_DIR
-}
-
-
-install_obsidian()
-{
-	intro
 
 	cd $OBSIDIAN_SCRIPT_DIR
+	
 	wget $obsidianSource
+	
 	obsidianExecutable=$(ls | grep -oP '.*AppImage')
+	
 	chmod ug+x $obsidianExecutable
 
 	if [[ -d "$obsidianInstallDir" ]]
 	then
 		graphics_comment "Obsidian Already Exists only the app will be changed"
-		cp $obsidianExecutable $obsidianInstallDir/obsidian.AppImage
 	else
 		graphics_comment "Obsidian Directory Will Be Created"
-		mkdir $obsidianInstallDir
+		mkdir -p $obsidianInstallDir
-		cp $obsidianExecutable $obsidianInstallDir/obsidian.AppImage
 	fi	
+	
+	cp $obsidianExecutable $obsidianInstallDir/obsidian.AppImage
+	
 	cd $obsidianInstallDir
 	graphics_comment "Markdown repertoire : $obsidianRep"
 	git clone $obsidianRep
 
-	cd $OBSIDIAN_SCRIPT_DIR
+	if [[ -d "$obsidianInstallDir/infoVault" ]]
-	rm -r $obsidianExecutable
+	then 
+		graphics_comment "Info Vault already here not replacing. don't forget update the git"
+	fi
+
+	graphics_install_prompt "Obsidian installation complete"
+	cd $MAIN_DIR
 
-	outro
 }

setup/programs/os/os_install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-COMMON_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+OS_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 package_manager="none"
 
@@ -53,6 +53,7 @@ install_from_scritp()
 
 install_start()
 {
+	cd $OS_SCRIPT_DIR
 	graphics_indication "Common installations these programs are OS independent from"
 	install_from_list "${common_programs_list[@]}"
 	graphics_indication "Istallation will begin for $OS"

setup/programs/picom/picom.sh

@@ -4,21 +4,10 @@ PICOM_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null &&
 picomDebianSource="--single-branch --branch next-rebase --depth=1 https://github.com/ibhagwan/picom"
 picom_req_list_debian=(libxext-dev libxcb1-dev libxcb-damage0-dev libxcb-dpms0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-randr0-dev libxcb-composite0-dev libxcb-image0-dev libxcb-present-dev libxcb-xinerama0-dev libxcb-glx0-dev libpixman-1-dev libdbus-1-dev libconfig-dev libgl-dev libegl-dev libpcre2-dev libevdev-dev uthash-dev libev-dev libx11-xcb-dev meson libpcre++-dev)
 
-intro()
-{
-	graphics_install_prompt "Picom Will be installed"
-}
-
-outro()
-{
-	graphics_install_prompt "Picom installation complete"
-	cd $MAIN_DIR
-}
-
 
 install_picom()
 {
-	intro
+	graphics_install_prompt "Picom Will be installed"
 
 	cd $PICOM_SCRIPT_DIR
 
@@ -56,5 +45,6 @@ install_picom()
 	
 	picom --config $USER_DOTFILE_DIR/picom/picom.conf &
 
-	outro
+	graphics_install_prompt "Picom installation complete"
+	cd $MAIN_DIR
 }

setup/programs/wallpaper/wallpaper.sh

@@ -2,23 +2,12 @@
 
 wallpaperSource="https://git.keydev.me/kerem/wallpaper"
 
-intro()
-{
-	graphics_install_prompt "Wallpapers will be installed"
-	graphics_install_prompt "Source $wallpaperSource"	
-}
-
-outro()
-{
-	graphics_install_prompt "Wallpaper installation complete"
-	cd $MAIN_DIR
-}
-
 install_wallpaper()
 {
 	${pckgmngr_list[$OS_NO]} feh	
 
-	intro 
+	graphics_install_prompt "Wallpapers will be installed"
+	graphics_install_prompt "Source $wallpaperSource"	
 
 	if [[ -d "$WALLPAPERS_DIR/wallpaper" ]]
 	then 
@@ -33,9 +22,10 @@ install_wallpaper()
 			git clone $wallpaperSource
 		fi
 	else 
+		mkdir -p $WALLPAPERS_DIR
 		cd $WALLPAPERS_DIR
 		git clone $wallpaperSource
 	fi
 
-	outro
+	graphics_install_prompt "Wallpaper installation complete"
 }

setup/setup.sh

@@ -25,6 +25,8 @@ exit_sucsess()
 	graphics_success "Linux instalation Script Has ended with Sucsess"
 }
 
+cd $SETUP_SCRIPT_DIR
+
 echo ""
 graphics_header "Wellcome to my Linux instalation Script"
 echo ""

setup/test.sh

@@ -3,10 +3,10 @@
 INSTALL_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 source $INSTALL_SCRIPT_DIR/config.sh 
-source $INSTALL_SCRIPT_DIR/programs/picom/picom.sh
 source $INSTALL_SCRIPT_DIR/../scripts/graphics.sh 
 source $INSTALL_SCRIPT_DIR/../scripts/check_installed.sh 
+source $MAIN_DIR/programs/obsidian/obsidian.sh
 
 OS="arch"
 CPU_CORE_COUNT=17
-install_picom
+install_obsidian