Bug fixes
This commit is contained in:
parent
494f8713d5
commit
e65710d9bd
13
Installer.sh
13
Installer.sh
|
@ -1,13 +1,22 @@
|
|||
#!/bin/bash
|
||||
read -r -p "Would you like to uninstall or install? (u/I)" input
|
||||
read -r -p "Would you like to uninstall or install? (U/I)" input
|
||||
case $input in
|
||||
[uU])
|
||||
make uninstall
|
||||
sudo make sudo_uninstall
|
||||
;;
|
||||
[iI])
|
||||
make install
|
||||
make make_desktop_file
|
||||
sudo make sudo_install
|
||||
read -r -p "Would you like a .desktop file on your desktop? (Y\n)" input2
|
||||
case $input2 in
|
||||
[yY])
|
||||
cp Calculator.desktop ${HOME}/Desktop
|
||||
;;
|
||||
*)
|
||||
echo "Hey! That's not an option!"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
echo "Hey! That's not an option!"
|
||||
|
|
38
Makefile
38
Makefile
|
@ -1,29 +1,6 @@
|
|||
|
||||
install:
|
||||
compile:
|
||||
g++ -Os -std=c++17 Calculator.cpp CalculatorFunctions.cpp -o CalculatorExecutable
|
||||
read -r -p "Would you like a .desktop file on your desktop? [Y/n] " input
|
||||
if [[ input = "Y" || input = "y" ]] then;
|
||||
cat > "Calculator.desktop"
|
||||
echo "[Desktop Entry]" >> Calculatlor.desktop
|
||||
echo "Name=Calculator" >> Calculator.desktop
|
||||
echo "Comment='A simple calculator, for simple math problems'" >> Calculator.desktop
|
||||
echo "Exec=/usr/local/CalculatorFiles/CalculatorExecutable" >> Calculator.desktop
|
||||
echo "Icon=/usr/local/CalculatorFiles/CalculatorIcon.png" >> Calculator.desktop
|
||||
echo "Type=Application" >> Calculator.desktop
|
||||
echo "Terminal=true" >> Calculator.desktop
|
||||
cp Calculator.desktop ${HOME}/Desktop
|
||||
fi
|
||||
if [[ input = "N" || input = "n" ]] then;
|
||||
cat > "Calculator.desktop"
|
||||
echo "[Desktop Entry]" >> Calculatlor.desktop
|
||||
echo "Name=Calculator" >> Calculator.desktop
|
||||
echo "Comment='A simple calculator, for simple math problems'" >> Calculator.desktop
|
||||
echo "Exec=/usr/local/CalculatorFiles/CalculatorExecutable" >> Calculator.desktop
|
||||
echo "Icon=/usr/local/CalculatorFiles/CalculatorIcon.png" >> Calculator.desktop
|
||||
echo "Type=Application" >> Calculator.desktop
|
||||
echo "Terminal=true" >> Calculator.desktop
|
||||
fi
|
||||
|
||||
sudo_install:
|
||||
mkdir /usr/local/CalculatorFiles
|
||||
cp CalculatorExecutable CalculatorIcon.png /usr/local/CalculatorFiles
|
||||
|
@ -34,6 +11,15 @@ uninstall:
|
|||
|
||||
sudo_uninstall:
|
||||
rm -rf /usr/local/CalculatorFiles
|
||||
rm /usr/local/share/applications/Calculator.desktop
|
||||
rm -f bah/usr/local/share/applications/Calculator.desktop
|
||||
|
||||
.PHONY: install sudo_install uninstall sudo_uninstall
|
||||
make_desktop_file:
|
||||
touch Calculator.desktop
|
||||
echo "[Desktop Entry]" > Calculator.desktop
|
||||
echo "Name=Calculator" >> Calculator.desktop
|
||||
echo "Comment='A simple calculator, for simple math problems'" >> Calculator.desktop
|
||||
echo "Exec=/usr/local/CalculatorFiles/CalculatorExecutable" >> Calculator.desktop
|
||||
echo "Icon=/usr/local/CalculatorFiles/CalculatorIcon.png" >> Calculator.desktop
|
||||
echo "Type=Application" >> Calculator.desktop
|
||||
echo "Terminal=true" >> Calculator.desktop
|
||||
.PHONY: compile sudo_install uninstall sudo_uninstall make_desktop_file
|
Reference in a new issue