diff --git a/setup.sh b/setup.sh index b6d80c6..49f5368 100644 --- a/setup.sh +++ b/setup.sh @@ -77,8 +77,17 @@ mkdir -p /opt git clone --depth 1 https://git.fake.onl/fake/fake-os.git $FAKE_PATH +#--------[ FAKE//OS Setup Logging ]--------# +mkdir -p /var/log/fake +touch /var/log/fake/fake-os.log + + #--------[ FAKE//OS Link System Tools ]--------# +rm -rf /usr/sbin/fake ln -sf $FAKE_PATH/src/fake_manager.sh /usr/sbin/fake + + +#--------[ FAKE//OS User Skel Files ]--------# rm -rf /etc/skel/.bashrc ln -sf $FAKE_PATH/src/fake_shell.sh /etc/skel/.bashrc rm -rf /etc/skel/.profile @@ -102,3 +111,4 @@ chmod -R 755 /opt/fakeos chmod +x /opt/fakeos/src/fake_environment.sh chmod +x /opt/fakeos/src/fake_manager.sh chmod +x /opt/fakeos/src/fake_shell.sh +chmod -R 755 /var/log/fake diff --git a/src/fake_manager.sh b/src/fake_manager.sh index b849f6f..be83e39 100644 --- a/src/fake_manager.sh +++ b/src/fake_manager.sh @@ -29,7 +29,9 @@ VARS=$(echo "$@" | sed -e 's/[^ ]* *//') # │ Update │ # └───────────────────────────────────────┘ _fake_update () { + echo "" echo "[UPDATE] $(date)" >> $FAKE_LOG + echo "" if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -Syyy && $FAKE_BTL paru --noconfirm -Syu" elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -Syyy && $FAKE_SUDO pacman --noconfirm -Syu" elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y update && $FAKE_SUDO apt -y upgrade" @@ -41,6 +43,7 @@ _fake_update () { if ! eval "$CMD 2>> $FAKE_LOG"; then while ! eval "$CMD"; do INDEX=$(( INDEX + 1 )) + echo "" echo "[ERROR] Retrying: Attempt $INDEX..." done fi @@ -53,7 +56,9 @@ _fake_update () { # │ Install │ # └───────────────────────────────────────┘ _fake_install () { + echo "" echo "[INSTALL] $@" >> $FAKE_LOG + echo "" if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -S $@" elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -S $@" elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y install $@" @@ -65,6 +70,7 @@ _fake_install () { if ! eval "$CMD 2>> $FAKE_LOG"; then while ! eval "$CMD"; do INDEX=$(( INDEX + 1 )) + echo "" echo "[ERROR] Retrying: Attempt $INDEX..." done fi @@ -76,7 +82,9 @@ _fake_install () { # │ Remove │ # └───────────────────────────────────────┘ _fake_remove () { + echo "" echo "[REMOVE] $@" >> $FAKE_LOG + echo "" if [ "$(command -v paru)" ]; then CMD="$FAKE_BTL paru --noconfirm -R $@" elif [ "$(command -v pacman)" ]; then CMD="$FAKE_SUDO pacman --noconfirm -R $@" elif [ "$(command -v apt)" ]; then CMD="$FAKE_SUDO apt -y remove $@" @@ -88,6 +96,7 @@ _fake_remove () { if ! eval "$CMD 2>> $FAKE_LOG"; then while ! eval "$CMD"; do INDEX=$(( INDEX + 1 )) + echo "" echo "[ERROR] Retrying: Attempt $INDEX..." done fi @@ -118,39 +127,49 @@ _fake_search () { # │ Service Daemon │ # └───────────────────────────────────────┘ _fake_start () { #--------[ Start Daemon ] + echo "" echo "[START] $@" for SERVICE in $@; do - if [ "$(command -v systemctl)" ]; then sudo systemctl start "$SERVICE" 2>> $FAKE_LOG; fi - if [ "$(command -v rc-update)" ]; then sudo rc-service "$SERVICE" start 2>> $FAKE_LOG; fi + if [ "$(command -v systemctl)" ]; then $FAKE_SUDO systemctl start "$SERVICE" 2>> $FAKE_LOG; fi + if [ "$(command -v rc-update)" ]; then $FAKE_SUDO rc-service "$SERVICE" start 2>> $FAKE_LOG; fi done + echo "" } _fake_stop () { #---------[ Stop Daemon ] + echo "" echo "[STOP] $@" for SERVICE in $@; do - if [ "$(command -v systemctl)" ]; then sudo systemctl start "$SERVICE" 2>> $FAKE_LOG; fi - if [ "$(command -v rc-update)" ]; then sudo rc-service "$SERVICE" start 2>> $FAKE_LOG; fi + if [ "$(command -v systemctl)" ]; then $FAKE_SUDO systemctl start "$SERVICE" 2>> $FAKE_LOG; fi + if [ "$(command -v rc-update)" ]; then $FAKE_SUDO rc-service "$SERVICE" start 2>> $FAKE_LOG; fi done + echo "" } _fake_restart () { #------[ Restart Daemon ] + echo "" echo "[RESTART] $@" for SERVICE in $@; do - if [ "$(command -v systemctl)" ]; then sudo systemctl restart "$SERVICE" 2>> $FAKE_LOG; fi - if [ "$(command -v rc-update)" ]; then sudo rc-service "$SERVICE" restart 2>> $FAKE_LOG; fi + if [ "$(command -v systemctl)" ]; then $FAKE_SUDO systemctl restart "$SERVICE" 2>> $FAKE_LOG; fi + if [ "$(command -v rc-update)" ]; then $FAKE_SUDO rc-service "$SERVICE" restart 2>> $FAKE_LOG; fi done + echo "" } _fake_enable () { #-------[ Enable Daemon at Startup ] + echo "" echo "[ENABLE] $@" for SERVICE in $@; do - if [ "$(command -v systemctl)" ]; then sudo systemctl enable "$SERVICE" 2>> $FAKE_LOG; fi - if [ "$(command -v rc-update)" ]; then sudo rc-update add "$SERVICE" 2>> $FAKE_LOG; fi + if [ "$(command -v systemctl)" ]; then $FAKE_SUDO systemctl enable "$SERVICE" 2>> $FAKE_LOG; fi + if [ "$(command -v rc-update)" ]; then $FAKE_SUDO rc-update add "$SERVICE" 2>> $FAKE_LOG; fi done + echo "" } _fake_disable () { #------[ Disable Daeon at Startup ] + echo "" echo "[DISABLE] $@" for SERVICE in $@; do if [ "$(command -v systemctl)" ]; then sudo systemctl disable "$SERVICE" 2>> $FAKE_LOG; fi if [ "$(command -v rc-update)" ]; then sudo rc-update rm "$SERVICE" 2>> $FAKE_LOG; fi done + echo "" } @@ -159,7 +178,9 @@ _fake_disable () { #------[ Disable Daeon at Startup ] # │ Other Functions │ # └───────────────────────────────────────┘ _fake_flush () { #--------[ Flush System Cache ] + echo "" sudo -u root $ENV_SHELL -c "sync; echo 3 > /proc/sys/vm/drop_caches" + echo "" } @@ -212,4 +233,8 @@ elif [ "$1" == "disable" ]; then _fake_disable "$VARS" elif [ "$1" == "flush" ]; then _fake_flush elif [ "$1" == "help" ]; then _fake_help #--------[ Error Catching ]--------# -else echo "[ERROR] Command '$1' not recognised."; fi +else + echo "" + echo "[ERROR] Command '$1' not recognised."; + echo "" +fi