Moved all functions to a shared file

albakhtari · Feb 13, 2023 · 41ea3c7 · 41ea3c7
1 parent aea4785
commit 41ea3c7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -158,13 +158,14 @@ After you run the installer, open your application menu, and search for "Photosh
 
 - [X] ~Colour code the output~ Colour code the output of all scripts using a `printMessage` function
 
+- [ x ] Move all functions to a function script
+
 - [ ] ~Check that components are installed in the installer~ Improve dependencies checking
 
 - [ ] Sort out the "open with Photoshop" issue
 
 - [ ] Add ability to create multiple prefixes
 
-- [ ] Move all functions to a function script
 
 ## CREDITS
 

diff --git a/main-menu.sh b/main-menu.sh
@@ -1,16 +1,8 @@
 #!/bin/bash
-export WINEPREFIX="$PWD/Ps-prefix"
 
-bold=$'\e[1m'
-reset=$'\e[0m'
-red=$'\e[1;31m'
-green=$'\e[1;32m'
-blue=$'\e[1;34m'
-magenta=$'\e[1;35m'
-cyan=$'\e[1;36m'
-yellow=$'\e[1;93m'
-white=$'\e[0m'
-norm=$'\e[21m'
+source "./scritps/shared.sh"
+
+export WINEPREFIX="$PWD/Ps-prefix"
 
 ! [ -d logs ] && mkdir logs
 

diff --git a/scripts/camera_raw.sh b/scripts/camera_raw.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-print_important() {
-  echo -e "\n    ${yellow}[+]${reset} ${bold}$1${reset} \n"
-}
+source "./shared.sh"
 
-cd ..
 export WINEPREFIX="$PWD/Ps-prefix/"
 
 sleep 1

diff --git a/scripts/shared.sh b/scripts/shared.sh
@@ -0,0 +1,14 @@
+print_important() {
+  echo -e "\n    ${yellow}[+]${reset} ${bold}$1${reset} \n"
+}
+
+yellow=$'\e[1;93m'
+bold=$'\e[1m'
+reset=$'\e[0m'
+red=$'\e[1;31m'
+green=$'\e[1;32m'
+blue=$'\e[1;34m'
+magenta=$'\e[1;35m'
+cyan=$'\e[1;36m'
+white=$'\e[0m'
+norm=$'\e[21m'