diff --git a/Build Linux b/Build Linux index 46afa4a5..3565d442 100755 --- a/Build Linux +++ b/Build Linux @@ -67,28 +67,6 @@ function copy_archiso() { rmdir "$ARCHLIVE_DIR/airootfs/etc/udev" --ignore-fail-on-non-empty } -function update_archlive() { - # build.sh - if ! grep -iq 'customize_iso' "$ARCHLIVE_DIR/build.sh"; then - sed -ir "s!run_once make_iso\$!# customize_iso\ncp -a \"$ROOT_DIR/.linux_items/include/iso\"/* \"\${work_dir}/iso\"/\n\nrun_once make_iso!" "$ARCHLIVE_DIR/build.sh" - fi - - # MOTD - sed -i "s/WK/$KIT_NAME_SHORT/" "$ARCHLIVE_DIR/airootfs/etc/motd" - - # Live packages - sed -i -r 's/^(b43|clonezilla|gpm|grml|refind|testdisk|vim)/#\1/' "$ARCHLIVE_DIR/packages.both" - cat "$ROOT_DIR/.linux_items/packages/live" >> "$ARCHLIVE_DIR/packages.both" - echo "[CustomRepo]" >> "$ARCHLIVE_DIR/pacman.conf" - echo "SigLevel = Optional TrustAll" >> "$ARCHLIVE_DIR/pacman.conf" - echo "file://$CUSTOM_REPO_DIR" >> "$ARCHLIVE_DIR/pacman.conf" - - # Oh My ZSH - git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git "$SKEL/.oh-my-zsh" - rm -Rf "$SKEL/.oh-my-zsh/.git" - curl -o "$SKEL/.oh-my-zsh/themes/lean.zsh-theme" https://raw.githubusercontent.com/miekg/lean/master/prompt_lean_test.zsh -} - function copy_settings() { if [[ ! -e "$BUILD_DIR/MAIN_SETTINGS" ]] || ask "Overwrite MAIN_SETTINGS?"; then cp -bv "$ROOT_DIR/.bin/Scripts/settings/main.py" "$BUILD_DIR/MAIN_SETTINGS" @@ -118,6 +96,32 @@ function run_elevated() { fi } +function update_archlive() { + # build.sh + if ! grep -iq 'customize_iso' "$ARCHLIVE_DIR/build.sh"; then + sed -ir "s!run_once make_iso\$!# customize_iso\ncp -a \"$ROOT_DIR/.linux_items/include/iso\"/* \"\${work_dir}/iso\"/\n\nrun_once make_iso!" "$ARCHLIVE_DIR/build.sh" + fi + + # MOTD + sed -i "s/WK/$KIT_NAME_SHORT/" "$ARCHLIVE_DIR/airootfs/etc/motd" + + # Live packages + sed -i -r 's/^(b43|clonezilla|gpm|grml|refind|testdisk|vim)/#\1/' "$ARCHLIVE_DIR/packages.both" + cat "$ROOT_DIR/.linux_items/packages/live" >> "$ARCHLIVE_DIR/packages.both" + echo "[CustomRepo]" >> "$ARCHLIVE_DIR/pacman.conf" + echo "SigLevel = Optional TrustAll" >> "$ARCHLIVE_DIR/pacman.conf" + echo "file://$CUSTOM_REPO_DIR" >> "$ARCHLIVE_DIR/pacman.conf" + + # Oh My ZSH + git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git "$SKEL/.oh-my-zsh" + rm -Rf "$SKEL/.oh-my-zsh/.git" + curl -o "$SKEL/.oh-my-zsh/themes/lean.zsh-theme" https://raw.githubusercontent.com/miekg/lean/master/prompt_lean_test.zsh + + # Wallpaper + mkdir -p "$ARCHLIVE_DIR/airootfs/usr/share/wallpaper" + cp "$ROOT_DIR/Images/Linux.png" "$ARCHLIVE_DIR/airootfs/usr/share/wallpaper/burned.in" +} + function update_repo() { if [[ "$EUID" -eq 0 ]]; then echo "This section not meant to be run as root."