Merge branch 'devel' of https://github.com/RITlug/TigerOS into devel

README.md

@@ -7,7 +7,6 @@ TigerOS
 ```  
   git clone https://github.com/RITlug/TigerOS.git
 ```
-* Install [Mock](https://github.com/rpm-software-management/mock/wiki) according to your system.
 ### Build the ISO
 From the directory where you cloned this repo run the commands below. You may need to preface it with `sudo` if you do not have root privileges.
 ```

ci-build-mock.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -eu
+
+#####################################################################
+# TigerOS Build Script for running on the build box with Jenkins CI #
+# @author: Aidan Kahrs	                                            #
+#                                                                   #
+# Usage: sudo bash build.sh					    #
+#                                                                   #
+#####################################################################
+wget -O tigeros.ks https://raw.githubusercontent.com/RITlug/TigerOS/master/tigeros.ks
+mock -r fedora-25-x86_64 --init
+mock -r fedora-25-x86_64 --copyin tigeros.ks ./tigeros.ks
+mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart svn
+mock -r fedora-25-x86_64 --chroot "svn export https://github.com/RITlug/TigerOS/trunk/scripts/"
+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"
+mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso /srv/isos/TigerOS.iso
+rm -rf /var/lmc/
+cd /srv/isos/
+sha512sum *.iso >CHECKSUM512
+
+

ci-build.sh

@@ -5,18 +5,15 @@ set -eu
 # TigerOS Build Script for running on the build box with Jenkins CI #
 # @author: Aidan Kahrs	                                            #
 #                                                                   #
-# Usage: sudo bash build.sh					    #
+# Usage: sudo bash build.sh					                        #
 #                                                                   #
 #####################################################################
+rm -rf tigeros.ks
 wget -O tigeros.ks https://raw.githubusercontent.com/RITlug/TigerOS/master/tigeros.ks
-mock -r fedora-25-x86_64 --init
-mock -r fedora-25-x86_64 --copyin tigeros.ks ./tigeros.ks
-mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart svn
-mock -r fedora-25-x86_64 --chroot "svn export https://github.com/RITlug/TigerOS/trunk/scripts/"
-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"
-mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso /srv/isos/TigerOS.iso
+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
+cp -f /var/lmc/TigerOS.iso /srv/isos/
 rm -rf /var/lmc/
-cd /srv/isos/
-sha512sum *.iso >CHECKSUM512
-
-
+cd /srv/isos
+sha512sum *.iso > CHECKSUM512
+cd /home/build
+rm -rf anaconda/ *.log

make-iso.sh

@@ -12,11 +12,12 @@ green=`tput setaf 2`
 reset=`tput sgr0`
 
 echo "${green}Welcome to the TigerOS build script${reset}"
-mock -r fedora-25-x86_64 --init
-mock -r fedora-25-x86_64 --copyin tigeros.ks ./tigeros.ks
-mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart svn
-mock -r fedora-25-x86_64 --chroot "svn export https://github.com/RITlug/TigerOS/trunk/scripts/"
+#mock -r fedora-25-x86_64 --init
+#mock -r fedora-25-x86_64 --copyin tigeros.ks ./tigeros.ks
+#mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart svn
+#mock -r fedora-25-x86_64 --chroot "svn export https://github.com/RITlug/TigerOS/trunk/scripts/"
 echo "${green}Beginning build process${reset}"
-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"
-mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso TigerOS.iso
+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
+#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"
+#mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso TigerOS.iso
 echo "${green}ISO saved to $(pwd)/TigerOS.iso${reset}"

rpmbuild/SPECS/tigeros-scripts.spec

@@ -0,0 +1,45 @@
+Name:           tigeros-scripts
+Version:        1.0
+Release:        1%{?dist}
+Summary:        TigerOS setup scripts
+License:        GPLv3
+URL:            https://github.com/RITlug/TigerOS
+Source0:    %{name}.tar.gz
+BuildArch:  noarch
+BuildRequires: git
+
+%description
+JFLAP is a package of graphical tools which can be used as an aid in learning the basic concepts of Formal Languages and Automata Theory. 
+
+%prep
+tar -xvf %{_sourcedir}/%{name}.tar.gz -C  %{_sourcedir}
+
+%build
+echo "We don't need to build"
+
+%install
+%{__mkdir_p} %{buildroot}%{_prefix}/local/tigeros
+install -p -m 755 %{_sourcedir}/FusionEnableLauncher.py %{buildroot}%{_prefix}/local/tigeros/FusionEnableLauncher.py
+%{__mkdir_p} %{buildroot}%{_prefix}/local/tigeros/cs
+install -p -m 755 %{_sourcedir}/cs/idea.sh %{buildroot}%{_prefix}/local/tigeros/cs/idea.sh
+install -p -m 755 %{_sourcedir}/cs/jflap.sh %{buildroot}%{_prefix}/local/tigeros/cs/jflap.sh
+install -p -m 755 %{_sourcedir}/cs/logisim.sh %{buildroot}%{_prefix}/local/tigeros/cs/logisim.sh
+install -p -m 755 %{_sourcedir}/enablerpmfusion.sh %{buildroot}%{_prefix}/local/tigeros/enablerpmfusion.sh
+install -p -m 755 %{_sourcedir}/removal %{buildroot}%{_prefix}/local/tigeros/removal
+install -p -m 755 %{_sourcedir}/postinstall %{buildroot}%{_prefix}/local/tigeros/postinstall
+%{__mkdir_p} %{buildroot}%{_prefix}/local/tigeros/se
+install -p -m 755 %{_sourcedir}/se/alloy.sh %{buildroot}%{_prefix}/local/tigeros/se/alloy.sh
+install -p -m 755 %{_sourcedir}/se/spin.sh %{buildroot}%{_prefix}/local/tigeros/se/spin.sh
+
+%files
+%{_prefix}/local/tigeros/FusionEnableLauncher.py
+%{_prefix}/local/tigeros/cs
+%{_prefix}/local/tigeros/cs/idea.sh
+%{_prefix}/local/tigeros/cs/jflap.sh
+%{_prefix}/local/tigeros/cs/logisim.sh
+%{_prefix}/local/tigeros/enablerpmfusion.sh
+%{_prefix}/local/tigeros/removal
+%{_prefix}/local/tigeros/postinstall
+%{_prefix}/local/tigeros/se/alloy.sh
+%{_prefix}/local/tigeros/se/spin.sh
+%changelog

tigeros.ks

@@ -362,9 +362,8 @@ cd /usr/share/backgrounds/images
 mkdir -p /usr/share/autostart
 mkdir -p /usr/local/tigeros/
 cd /usr/local/tigeros/
-#wget people.rit.edu/axk4545/scripts.tar.gz
-wget --no-check-certificate http://129.21.1.44/axk4545/scripts.tar.gz
-tar -xvf /usr/local/tigeros/scripts.tar.gz -C /usr/local/tigeros/
+svn export https://github.com/RITlug/TigerOS/trunk/scripts/ /usr/local/tigeros/
+mv "scripts/*" /usr/local/tigeros/
 ln -s /usr/local/enablerpmfusion.sh /usr/share/autostart/enablerpmfusion.sh
 ln -s /usr/local/tigeros/FusionEnableLauncher.py /usr/share/autostart/FusionEnableLauncher.py
 ln -s /usr/local/tigeros/postinstall /usr/share/autostart/postinstall