diff --git a/README.md b/README.md index 4de8b95..7d3e256 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,14 @@ TigerOS ``` git clone https://github.com/RITlug/TigerOS.git ``` -Install lorax-lmc-novirt +Install [mock](https://github.com/rpm-software-management/mock/wiki) ### Build the ISO +Requires current version of Fedora.x86\_64 to build. 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. ``` chmod +x make-iso.sh -bash make-iso.sh +./make-iso.sh ``` With a 3.40GHz dual core i3 CPU with hyperthreading enabled and 16GB of RAM, the build process after the initial build should take approximately 40 minutes to complete. The initial build time will vary based on specs. diff --git a/ci-build-mock.sh b/ci-build-mock.sh index 2c7b466..e108236 100644 --- a/ci-build-mock.sh +++ b/ci-build-mock.sh @@ -3,9 +3,9 @@ set -eu ##################################################################### # TigerOS Build Script for running on the build box with Jenkins CI # -# @author: Aidan Kahrs # +# @author: Aidan Kahrs # # # -# Usage: sudo bash ci-build-mock.sh # +# Usage: sudo bash ci-build-mock.sh # # # ##################################################################### # Check that the current user is root @@ -17,12 +17,15 @@ fi 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 --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" -mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso /srv/isos/TigerOS.iso +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/ -cd /srv/isos/ -sha512sum *.iso >CHECKSUM512 -chown -R apache:apache /srv +cd /srv/isos +rm -rf CHECKSUM512-$(date +%Y%m%d) +sha512sum TigerOS-$(date +%Y%m%d).iso > CHECKSUM512-$(date +%Y%m%d) +chown -R nginx:nginx /srv +chmod 755 /srv/isos/*.iso +echo "Build finished" diff --git a/make-iso.sh b/make-iso.sh index d96bc64..b18e438 100644 --- a/make-iso.sh +++ b/make-iso.sh @@ -2,10 +2,10 @@ set -eu #################################################################### -# TigerOS Build Script # +# TigerOS Build Script # # @author: Aidan Kahrs # # # -# Usage: sudo bash make-iso.sh # +# Usage: sudo bash make-iso.sh # # # #################################################################### green=`tput setaf 2` @@ -18,13 +18,13 @@ then echo "Please run this script as root (sudo $@$0)." exit fi -#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 --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 echo "${green}Beginning build process${reset}" -setenforce 0 -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 +#setenforce 0 +#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}" -setenforce 1 +#setenforce 1 diff --git a/packages/tigeros-bookmarks-1.0.0-1.fc25.src.rpm b/packages/tigeros-bookmarks-1.0.0-1.fc25.src.rpm deleted file mode 100644 index 776082c..0000000 Binary files a/packages/tigeros-bookmarks-1.0.0-1.fc25.src.rpm and /dev/null differ diff --git a/packages/tigeros-bookmarks-1.0.0-2.fc25.src.rpm b/packages/tigeros-bookmarks-1.0.0-2.fc25.src.rpm new file mode 100644 index 0000000..c47e154 Binary files /dev/null and b/packages/tigeros-bookmarks-1.0.0-2.fc25.src.rpm differ diff --git a/packages/tigeros-scripts-1.0-1.fc25.src.rpm b/packages/tigeros-scripts-1.0-1.fc25.src.rpm index 2a3b80b..f196099 100644 Binary files a/packages/tigeros-scripts-1.0-1.fc25.src.rpm and b/packages/tigeros-scripts-1.0-1.fc25.src.rpm differ diff --git a/scripts/enablerpmfusion.sh b/scripts/enablerpmfusion similarity index 89% rename from scripts/enablerpmfusion.sh rename to scripts/enablerpmfusion index 49e1b21..4d3f5b4 100644 --- a/scripts/enablerpmfusion.sh +++ b/scripts/enablerpmfusion @@ -8,7 +8,7 @@ then echo "Please run this script as root ( $@$0)." exit 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 sudo enablerpmfusion in a terminal." +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 sudo enablerpmfusion in a terminal." while true; do read -p "Do you wish to continue? [y/n] " yn case $yn in diff --git a/scripts/postinstall b/scripts/postinstall index b863519..6b1e774 100644 --- a/scripts/postinstall +++ b/scripts/postinstall @@ -11,9 +11,10 @@ then exit fi echo -e "Welcome to the TigerOS post install script.\n -This script will install a set of packages used for classes in your major." +This script will walk you through initial configuration if TigerOS including installing a set of packages used for classes in your major." echo -e "\n" sleep 5; +./usr/local/bin/enablerpmfusion PS3='Please enter your major: ' options=("CS" "IT/WMC" "NSSA/CIT" "SE" "Quit") select opt in "${options[@]}"