Added back "Installe.sh" but completly rewrote it
This commit is contained in:
parent
c69e2554be
commit
8f27bb8c9f
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,4 +1,4 @@
|
||||||
Calculator
|
CalculatorExecutable
|
||||||
tbc
|
tbc
|
||||||
CalculatorIcon.png
|
CalculatorIcon.png
|
||||||
Calculator.desktop
|
Calculator.desktop
|
15
Installer.sh
Normal file
15
Installer.sh
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
#!/bin/bash
|
||||||
|
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
|
||||||
|
sudo make sudo_install
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Hey! That's not an option!"
|
||||||
|
;;
|
||||||
|
esac
|
89
Makefile
89
Makefile
|
@ -1,57 +1,42 @@
|
||||||
# Makefile for Terminal-Based-Calculator
|
|
||||||
# Project by T4rtP1ck13 (https://github/com/T4rtP1ck13)
|
|
||||||
# Makefile by Bowuigi (https://github.com/Bowuigi)
|
|
||||||
|
|
||||||
IN=$(wildcard *.cpp)
|
install:
|
||||||
OUT=tbc
|
g++ -Os -std=c++17 Calculator.cpp CalculatorFunctions.cpp -o CalculatorExecutable
|
||||||
CPPFLAGS=-std=c++17 -Os
|
read -r -p "Would you like a .desktop file on your desktop? [Y/n] " input
|
||||||
CPP=c++
|
if [[ input = "Y" || input = "y" ]]
|
||||||
STRIP=strip
|
then
|
||||||
DESTDIR=/usr/local/bin
|
cat > "Calculator.desktop <<- EOF"
|
||||||
DESKTOPDIR=/usr/local/share/applications
|
[Desktop Entry]
|
||||||
DESKTOPFILE=Calculator.desktop
|
Comment='Calculator for simple problems!'
|
||||||
|
Exec=/usr/local/CalculatorFiles/CalculatorExec
|
||||||
|
Icon=/usr/local/CalculatorFiles/CalculatorIcon.png
|
||||||
|
Name=Calculator
|
||||||
|
Terminal=true
|
||||||
|
Type=Application
|
||||||
|
EOF
|
||||||
|
cp Calculator.desktop ${HOME}/Desktop
|
||||||
|
if [[ input = "N" || input = "n" ]]
|
||||||
|
then
|
||||||
|
cat > "Calculator.desktop" <<- EOF
|
||||||
|
[Desktop Entry]
|
||||||
|
Comment='Calculator for simple problems!'
|
||||||
|
Exec=/usr/local/CalculatorFiles/CalculatorExec
|
||||||
|
Icon=/usr/local/CalculatorFiles/CalculatorIcon.png
|
||||||
|
Name=Calculator
|
||||||
|
Terminal=true
|
||||||
|
Type=Application
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
build:
|
sudo_install:
|
||||||
@echo "Compiling..."
|
mkdir /usr/local/CalculatorFiles
|
||||||
$(CPP) $(IN) $(CPPFLAGS) -o $(OUT)
|
cp CalculatorExecutable CalculatorIcon.png /usr/local/CalculatorFiles
|
||||||
$(STRIP) $(OUT)
|
cp Calculator.desktop /usr/local/share/applications
|
||||||
@echo "Done!"
|
|
||||||
@echo "Enjoy your calculator!"
|
|
||||||
|
|
||||||
install: build
|
|
||||||
@echo "Installing to" $(DESTDIR) "..."
|
|
||||||
mkdir -p $(DESTDIR)
|
|
||||||
cp $(OUT) $(DESTDIR)
|
|
||||||
@echo "Done!"
|
|
||||||
|
|
||||||
desktop: install
|
|
||||||
rm -f $(DESKTOPFILE)
|
|
||||||
@echo "Creating the desktop file..."
|
|
||||||
echo "[Desktop Entry]" > $(DESKTOPFILE)
|
|
||||||
echo "Name=Calculator" >> $(DESKTOPFILE)
|
|
||||||
echo "Exec=" $(DESTDIR)/$(OUT) >> $(DESKTOPFILE)
|
|
||||||
echo "Terminal=true" >> $(DESKTOPFILE)
|
|
||||||
echo "Comment='Calculator for simple math problems'" >> $(DESKTOPFILE)
|
|
||||||
echo "Type=Application" >> $(DESKTOPFILE)
|
|
||||||
echo "Icon=$${HOME}/CalculatorFiles/CalculatorIcon.png" >> $(DESKTOPFILE)
|
|
||||||
@echo "Copying the desktop file to" $(DESKTOPDIR) "..."
|
|
||||||
mkdir $${HOME}/CalculatorFiles
|
|
||||||
cd $${HOME}/Terminal-Based-Calculator
|
|
||||||
cp $(DESKTOPFILE) $(DESKTOPDIR)
|
|
||||||
cp $(DESKTOPFILE) $${HOME}/Desktop
|
|
||||||
cp CalculatorIcon.png $${HOME}/CalculatorFiles
|
|
||||||
mv CalculatorIcon.png $${HOME}/CalculatorFiles
|
|
||||||
rm -rf Terminal-Based-Calculator
|
|
||||||
@echo "Done!"
|
|
||||||
clean:
|
|
||||||
@echo "Cleaning..."
|
|
||||||
rm -f $(OUT)
|
|
||||||
@echo "Done!"
|
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
@echo "Uninstalling..."
|
rm ${HOME}/Desktop/Calculator.desktop
|
||||||
rm -f $(DESTDIR)/$(OUT)
|
|
||||||
rm -f $(DESKTOPDIR)/$(DESKTOPFILE)
|
|
||||||
@echo "Done!"
|
|
||||||
|
|
||||||
.PHONY: build desktop install clean uninstall
|
sudo_uninstall:
|
||||||
|
rm -rf /usr/local/CalculatorFiles
|
||||||
|
rm /usr/local/share/applications/Calculator.desktop
|
||||||
|
|
||||||
|
.PHONY: install sudo_install uninstall sudo_uninstall
|
Reference in a new issue