2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Misc updates

Browse source
This commit is contained in:
2Shirt 2017-12-18 19:37:49 -07:00
parent 6bbc15d4f1
commit 9c04a5dc83
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.linux_items/include/live/airootfs/etc/hosts Normal file
View file

@ -0,0 +1,3 @@
127.0.0.1 localhost.localdomain localhost
::1 localhost.localdomain localhost

2
.linux_items/include/live/airootfs/etc/motd
View file

@ -1,4 +1,4 @@
Welcome to the WK Linux Toolbox Welcome to the ______
Some common commands: Some common commands:
% hw-diags % hw-diags

3
.linux_items/packages/live
View file

@ -54,6 +54,9 @@ pasystray
pavucontrol pavucontrol
progsreiserfs progsreiserfs
pulseaudio pulseaudio
python
python-psutil
python-requests
qemu-guest-agent qemu-guest-agent
reiserfsprogs reiserfsprogs
rfkill rfkill

17
Build Linux
View file

@ -66,10 +66,7 @@ function load_settings() {
## Answer: https://stackoverflow.com/a/13864829 ## Answer: https://stackoverflow.com/a/13864829
## Answer by: https://stackoverflow.com/users/1633643/lionel ## Answer by: https://stackoverflow.com/users/1633643/lionel
## Answer edit: https://stackoverflow.com/users/-1/community ## Answer edit: https://stackoverflow.com/users/-1/community
if [ -z ${KIT_NAME_FULL+x} ]; then if [ ! -z ${KIT_NAME_FULL+x} ]; then
# KIT_NAME_FULL is unset
: # pass
else
# KIT_NAME_FULL is set # KIT_NAME_FULL is set
return 0 # Skip loading settings from main.py return 0 # Skip loading settings from main.py
fi fi
@ -99,6 +96,8 @@ function copy_live_env() {
# Add items # Add items
rsync -aI "$ROOT_DIR/.linux_items/include/live/" "$LIVE_DIR/" rsync -aI "$ROOT_DIR/.linux_items/include/live/" "$LIVE_DIR/"
mkdir -p "$LIVE_DIR/airootfs/usr/local/bin"
rsync -aI "$ROOT_DIR/.bin/Scripts/" "$LIVE_DIR/airootfs/usr/local/bin/"
# Remove items # Remove items
rm "$LIVE_DIR/airootfs/etc/systemd/scripts/choose-mirror" rm "$LIVE_DIR/airootfs/etc/systemd/scripts/choose-mirror"
@ -141,6 +140,7 @@ function update_live_env() {
echo "[custom]" >> "$LIVE_DIR/pacman.conf" echo "[custom]" >> "$LIVE_DIR/pacman.conf"
echo "SigLevel = Optional TrustAll" >> "$LIVE_DIR/pacman.conf" echo "SigLevel = Optional TrustAll" >> "$LIVE_DIR/pacman.conf"
echo "Server = file://$REPO_DIR" >> "$LIVE_DIR/pacman.conf" echo "Server = file://$REPO_DIR" >> "$LIVE_DIR/pacman.conf"
echo "" >> "$LIVE_DIR/pacman.conf"
# Mirrors # Mirrors
sed -i -r 's/^(.*mirrorlist.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh" sed -i -r 's/^(.*mirrorlist.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
@ -148,7 +148,7 @@ function update_live_env() {
echo "sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" echo "sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
# MOTD # MOTD
sed -i "s/WK/$KIT_NAME_SHORT/" "$LIVE_DIR/airootfs/etc/motd" sed -i "s/_+/$KIT_NAME_FULL Linux Environment/" "$LIVE_DIR/airootfs/etc/motd"
# Oh My ZSH # Oh My ZSH
git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git "$SKEL_DIR/.oh-my-zsh" git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git "$SKEL_DIR/.oh-my-zsh"
@ -157,7 +157,8 @@ function update_live_env() {
# Openbox theme # Openbox theme
git clone --depth=1 git@github.com:addy-dclxvi/Openbox-Theme-Collections.git "$TEMP_DIR/ob-themes" git clone --depth=1 git@github.com:addy-dclxvi/Openbox-Theme-Collections.git "$TEMP_DIR/ob-themes"
cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$LIVE_DIR/airootfs/usr/share/themes/Triste-Orange" mkdir -p "$LIVE_DIR/airootfs/usr/share/themes"
cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$LIVE_DIR/airootfs/usr/share/themes/"
# Services # Services
sed -i -r 's/^(.*pacman-init.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh" sed -i -r 's/^(.*pacman-init.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh"
@ -197,10 +198,6 @@ function update_live_env() {
# Wallpaper # Wallpaper
mkdir -p "$LIVE_DIR/airootfs/usr/share/wallpaper" mkdir -p "$LIVE_DIR/airootfs/usr/share/wallpaper"
cp "$ROOT_DIR/Images/Linux.png" "$LIVE_DIR/airootfs/usr/share/wallpaper/burned.in" cp "$ROOT_DIR/Images/Linux.png" "$LIVE_DIR/airootfs/usr/share/wallpaper/burned.in"
# WiFi
echo "WIFI_SSID='$WIFI_SSID'" >> "$LIVE_DIR/airootfs/usr/local/bin/wifi.conf"
echo "WIFI_PASSWORD='$WIFI_PASSWORD'" >> "$LIVE_DIR/airootfs/usr/local/bin/wifi.conf"
} }
function update_repo() { function update_repo() {