From e20c4c06f2d6b189e52acf678afd9feb5ab9bd55 Mon Sep 17 00:00:00 2001 From: Josh Bicking Date: Mon, 24 Apr 2017 13:45:17 -0400 Subject: [PATCH] fix indentation in scripts, add editorconfig file --- .editorconfig | 16 ++++++++++++++++ scripts/enablerpmfusion.sh | 6 +++--- scripts/postinstall | 24 ++++++++++++------------ scripts/removal | 6 +++--- 4 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c998bf6 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +# EditorConfig file: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix line endings +[*] +end_of_line = lf + +# 4 space indentation for every file +indent_style = space +indent_size = 4 + +# Except for in Makefiles +[Makefile] +indent_style = tab diff --git a/scripts/enablerpmfusion.sh b/scripts/enablerpmfusion.sh index a87ce2c..da91373 100644 --- a/scripts/enablerpmfusion.sh +++ b/scripts/enablerpmfusion.sh @@ -8,9 +8,9 @@ then fi echo "This script will enable the RPMFusion repositories for nonfree or patent encumbered software. Due to the legal implications of shipping non-free or patent encumbered technology, we cannot enable these packages by default. Long story short, if you want to do things like like listen to mp3, or watch youtube videos in your browser, you will probably need to enable these options. You may enable these options at any time by running the enablerpmfusion.sh script located on your desktop." while true; do - read -p "Do you wish to continue? [y/n] " yn - case $yn in - [Yy]* ) dnf install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm;; + read -p "Do you wish to continue? [y/n] " yn + case $yn in + [Yy]* ) dnf install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm;; [Nn]* ) exit;; esac done diff --git a/scripts/postinstall b/scripts/postinstall index ea10099..d38735a 100644 --- a/scripts/postinstall +++ b/scripts/postinstall @@ -30,12 +30,12 @@ do esac done ./cs/idea.sh - dnf copr enable phracek/PyCharm; dnf install pycharm-community; + dnf copr enable phracek/PyCharm; dnf install pycharm-community; # TODO PROLOG wget https://mirror.racket-lang.org/installers/6.8/racket-6.8-x86_64-linux.sh - chmod +x racket-6.8-x86_64-linux.sh - ./racket-6.8-x86_64-linux.sh - ./cs/logisim.sh + chmod +x racket-6.8-x86_64-linux.sh + ./racket-6.8-x86_64-linux.sh + ./cs/logisim.sh ./cs/jflap.sh ;; "IT/WMC") @@ -55,9 +55,9 @@ do dnf install -y mongodb semanage port -a -t mongod_port_t -p tcp 27017 dnf install -y subversion filezilla nodejs java-1.8.0-openjdk - echo "Due to licensing constraints we cannot distribute jGrasp at this time.\n - Please see http://spider.eng.auburn.edu/user-cgi/grasp/grasp.pl?;dl=download_jgrasp.html for download instructions.\n - Please note that the JDK is already installed and accesibble on your system." + echo "Due to licensing constraints we cannot distribute jGrasp at this time.\n + Please see http://spider.eng.auburn.edu/user-cgi/grasp/grasp.pl?;dl=download_jgrasp.html for download instructions.\n + Please note that the JDK is already installed and accesibble on your system." mysql_secure_installation echo "Install finished" exit @@ -73,11 +73,11 @@ do esac done dnf install -y wireshark-gtk python python3 java-1.8.0-openjdk - groupadd wireshark - usermod -aG wireshark $USER - echo "Due to licensing constraints we cannot distribute jGrasp at this time.\n - Please see http://spider.eng.auburn.edu/user-cgi/grasp/grasp.pl?;dl=download_jgrasp.html for download instructions.\n - Please note that the JDK is already installed and accessible on your system." + groupadd wireshark + usermod -aG wireshark $USER + echo "Due to licensing constraints we cannot distribute jGrasp at this time.\n + Please see http://spider.eng.auburn.edu/user-cgi/grasp/grasp.pl?;dl=download_jgrasp.html for download instructions.\n + Please note that the JDK is already installed and accessible on your system." echo "Install finished" exit ;; diff --git a/scripts/removal b/scripts/removal index 4199b0f..0489a2d 100644 --- a/scripts/removal +++ b/scripts/removal @@ -46,8 +46,8 @@ do esac done sudo dnf -y remove mongodb subversion filezilla nodejs php mysql-repo.rpm mysql-community-server - semanage port -d -t mongod_port_t -p tcp 27017 - firewall-cmd --del-port=22017/tcp --permanent && firewall-cmd --reload + semanage port -d -t mongod_port_t -p tcp 27017 + firewall-cmd --del-port=22017/tcp --permanent && firewall-cmd --reload ;; "NSSA/CIT") echo -e "Welcome to the TigerOS NSSA/CIT package removal script.\n @@ -75,7 +75,7 @@ do done sudo dnf -y remove eclipse-jdt ruby sqlite gitk plantuml ./se/spin.sh --remove - ./se/alloy.sh --remove + ./se/alloy.sh --remove echo "All files have been removed." exit ;;