diff options
| -rw-r--r-- | .emacs.d/org/config.org | 1 | ||||
| -rwxr-xr-x | .local/bin/system-upgrade | 25 |
2 files changed, 20 insertions, 6 deletions
diff --git a/.emacs.d/org/config.org b/.emacs.d/org/config.org index 220359c..f6d0671 100644 --- a/.emacs.d/org/config.org +++ b/.emacs.d/org/config.org @@ -825,7 +825,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (global-set-key [f5] 'my/exec-f5) (global-set-key [f6] 'my/exec-f6) (global-set-key (kbd "C-x d") 'ranger) -(global-set-key (kbd "M-1") 'ranger) ;; (add-hook 'rust-mode-hook 'my/cargo-f5-minor-mode) (shell-pop--set-shell-type 'my/shell-pop-shell-type my/shell-pop-shell-type) diff --git a/.local/bin/system-upgrade b/.local/bin/system-upgrade index bb348fd..0b2d409 100755 --- a/.local/bin/system-upgrade +++ b/.local/bin/system-upgrade @@ -17,6 +17,8 @@ use constant { TR_PATH => '/usr/bin/tr', TEE_PATH => '/usr/bin/tee', FREEBSD_UPDATE_PATH => '/usr/sbin/freebsd-update', + PKG_PATH => '/usr/sbin/pkg', + PORTSNAP_PATH => '/usr/sbin/portsnap', PORTMASTER_PATH => '/usr/local/sbin/portmaster', ESPEAK_PATH => '/usr/local/bin/espeak', NOTIFY_PATH => '/usr/local/bin/notify-send', @@ -35,8 +37,8 @@ sub user_shell { my $ret = system( DASH_PATH, '-c', - SU_PATH . ' ' . DEFAULT_USER . ' << EOF -' . $_[0] . ' >/dev/null 2>&1 + SU_PATH . ' ' . DEFAULT_USER . ' << EOF >/dev/null 2>&1 +' . $_[0] . ' EOF' ); return $ret; @@ -44,12 +46,12 @@ EOF' sub fbsd_update { my $output; - print ' + print " +----------------+ | | | FreeBSD update | | | -+----------------+' . "\n\n"; ++----------------+\n\n"; user_shell(NOTIFY_PATH . ' "Fetching" "Fetching FreeBSD updates"'); user_shell(ESPEAK_PATH . ' "Initializing. Fetching FreeBSD updates" &'); open( @@ -65,11 +67,23 @@ sub fbsd_update { if (!($output =~ m/No updates needed/)) { user_shell(NOTIFY_PATH . ' "Installing" "Installing FreeBSD updates"'); user_shell(ESPEAK_PATH . ' "Installing FreeBSD updates" &'); - root_shell(FREEBSD_UPDATE_PATH . ' install'); + system( + FREEBSD_UPDATE_PATH, + 'install' + ); } return; } +sub ports_update { + print " ++----------------+ +| | +| ports update | +| | ++----------------+\n\n"; +} + sub clean_exit { my $end_date = `/bin/date`; chomp($end_date); @@ -89,6 +103,7 @@ sub main { close($fh); tee(STDOUT, '>>', LOG_FILE); fbsd_update(); + ports_update(); clean_exit(); } |