Browse Source

fix conflicts

website
axk4545 7 years ago
parent
commit
e21cb29ae1
6 changed files with 13 additions and 14 deletions
  1. +1
    -1
      ci-build-mock.sh
  2. BIN
      packages/tigeros-scripts-1.0-1.fc25.src.rpm
  3. +6
    -5
      scripts/postinstall
  4. +2
    -3
      scripts/removal
  5. +2
    -3
      scripts/tigeros-postinstall.desktop
  6. +2
    -2
      tigeros.ks

+ 1
- 1
ci-build-mock.sh View File

@ -21,7 +21,7 @@ mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart
mock -r fedora-25-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project TigerOS-Live --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 25 --title TigerOS-live --macboot"
rm -rf /srv/isos/TigerOS-$(date +%Y%m%d).iso
mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso /srv/isos/TigerOS-$(date +%Y%m%d).iso
rm -rf /var/lmc/
rm -rf /var/lib/mock/
cd /srv/isos
rm -rf CHECKSUM512-$(date +%Y%m%d)
sha512sum TigerOS-$(date +%Y%m%d).iso > CHECKSUM512-$(date +%Y%m%d)

BIN
packages/tigeros-scripts-1.0-1.fc25.src.rpm View File


+ 6
- 5
scripts/postinstall View File

@ -7,7 +7,7 @@
# Check that the current user is root
if [ $EUID != 0 ]
then
echo "Please run this script as root ( $@$0)."
echo "Please run this script as root (sudo $@$0)."
exit
fi
echo
@ -15,7 +15,7 @@ echo -e "Welcome to the TigerOS post install script.\n
This script will walk you through initial configuration of TigerOS including installing a set of packages used for classes in your major."
echo
find /home -name "tigeros-postinstall.desktop" -exec rm {} + 2>/dev/null
#bash /usr/local/bin/enablerpmfusion
bash /usr/local/bin/enablerpmfusion
PS3='Please enter a number: '
options=("CS" "IT/WMC" "NSSA/CIT" "SE" "Quit")
select opt in "${options[@]}"
@ -60,10 +60,11 @@ This script will install mysql, mongodb, subversion, filezilla, and nodejs on yo
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 -e "Due to licensing constraints we cannot distribute jGrasp at this time. \n
echo -e "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
rm mysql-repo.rpm
echo "Install finished"
exit
;;
@ -81,7 +82,7 @@ This script will install wireshark, python 2.7, and python 3 on your machine."
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
echo -e "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"
@ -99,7 +100,7 @@ This script will install ruby, eclipse, Spin, sqlite3, plantUML, gitk and MIT Al
esac
done
dnf install -y eclipse-jdt ruby sqlite plantuml gitk geany
bash /usr/local/bin/se/spin.sh && bash /usr/bin/tigeros/se/alloy.sh
bash /usr/local/bin/se/spin.sh && bash /usr/local/bin/se/alloy.sh
echo "Install finished"
exit
;;

+ 2
- 3
scripts/removal View File

@ -51,7 +51,6 @@ This script will remove mysql, mongodb, subversion, filezilla, and nodejs from y
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
echo "Removal finished."
exit
;;
@ -66,7 +65,7 @@ This script will remove wireshark, python 2.7, and python 3 from your machine."
[Nn]* ) exit;;
esac
done
sudo dnf -y remove wireshark
sudo dnf -y remove wireshark --ignore-missing
echo "Removal finished."
exit
;;
@ -81,7 +80,7 @@ This script will remove ruby, eclipse, Spin, sqlite3 and MIT Alloy from your mac
[Nn]* ) exit;;
esac
done
sudo dnf -y remove eclipse-jdt ruby sqlite gitk plantuml
sudo dnf -y remove eclipse-jdt ruby sqlite gitk plantuml --ignore-missing
bash /usr/local/bin/se/spin.sh --remove
bash /usr/local/bin/se/alloy.sh --remove
echo "Removal finished."

+ 2
- 3
scripts/tigeros-postinstall.desktop View File

@ -2,7 +2,6 @@
Version=1.0
Type=Application
Name=TigerOS postinstall script
Comment=
Exec=gnome-terminal -e "sudo /usr/share/tigeros/postinstall"
Comment=First run post install onfigurations
Exec=Exec=gnome-terminal -e "sudo /usr/local/bin/postinstall" --windows-with-profile="First Run"
Terminal=false

+ 2
- 2
tigeros.ks View File

@ -354,9 +354,9 @@ restorecon -R /home/liveuser
EOF
# Fetch scripts
# TigerOS specific setup
chmod +x /usr/local/bin/\*
gsettings set org.cinnamon.desktop.background picture-uri "file:///usr/share/backgrounds/tigeros/wallpaper2-1920-1080.jpg"
gsettings set org.cinnamon.desktop.background picture-uri "file:///usr/share/backgrounds/tigeros/wallpaper2-1920x1080.jpg"
restorecon -R /usr/local/bin
%end

Loading…
Cancel
Save