From bf34d3295fceb5131228593c602a452303d8134a Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 12 Nov 2021 16:28:10 -0500 Subject: [PATCH 01/16] [F] Fix submodules --- fastinstall.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fastinstall.sh b/fastinstall.sh index b08a6d6..da998ed 100644 --- a/fastinstall.sh +++ b/fastinstall.sh @@ -20,8 +20,10 @@ addline .zshrc 'SCR="$HOME/zshrc/scripts"' addline .zshrc '. $SCR/zshrc.sh' # Initialize submodules +pushd zshrc git submodule init git submodule update +popd # Return to the previous directory popd From 3e71f7f6e2252904b64ade8ea29a3e44de640f15 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Tue, 23 Nov 2021 11:47:11 -0500 Subject: [PATCH 02/16] [+] Add alias for IDEA and xcode --- scripts/includes/mac.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/includes/mac.sh b/scripts/includes/mac.sh index 1af2966..758c9e6 100644 --- a/scripts/includes/mac.sh +++ b/scripts/includes/mac.sh @@ -4,8 +4,11 @@ if [[ $OSTYPE == 'darwin'* ]]; then alias ports="netstat -ap tcp | grep -i \"listen\"" alias ports2="sudo lsof -i -P | grep LISTEN" alias trash="rmtrash" + alias checkrain="/Applications/checkra1n.app/Contents/MacOS/checkra1n" alias obs="open -n -a OBS.app" + alias idea="open -a Intellij\ IDEA.app" + alias xcode="open -a Xcode.app" # Java export JDK8="/usr/local/opt/openjdk@8/libexec/openjdk.jdk/Contents/Home" From c1d58672d91f233f6939536e54a4cda350ca3efe Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Thu, 25 Nov 2021 23:09:31 -0500 Subject: [PATCH 03/16] [+] Extend color command to include RGB coloring --- scripts/helpers/prompt.py | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/scripts/helpers/prompt.py b/scripts/helpers/prompt.py index 3bedb53..0bb92d5 100755 --- a/scripts/helpers/prompt.py +++ b/scripts/helpers/prompt.py @@ -1,14 +1,32 @@ #!/usr/bin/env python3 import json import sys -import time -from typing import Tuple, List + + +def ansirgb(r: int, g: int, b: int, foreground: bool = True) -> str: + c = '38' if foreground else '48' + return f'\033[{c};2;{r};{g};{b}m' def replace_color(msg: str) -> str: replacements = ["&0/\033[0;30m", "&1/\033[0;34m", "&2/\033[0;32m", "&3/\033[0;36m", "&4/\033[0;31m", "&5/\033[0;35m", "&6/\033[0;33m", "&7/\033[0;37m", "&8/\033[1;30m", "&9/\033[1;34m", "&a/\033[1;32m", "&b/\033[1;36m", "&c/\033[1;31m", "&d/\033[1;35m", "&e/\033[1;33m", "&f/\033[1;37m", "&r/\033[0m", "&n/\n"] for r in replacements: msg = msg.replace(r[:2], r[3:]) + + while '&gf(' in msg or '&gb(' in msg: + i = msg.index('&gf(') if '&gf(' in msg else msg.index('&gb(') + end = msg.index(')', i) + code = msg[i + 4:end] + fore = msg[i + 2] == 'f' + + if code.startswith('#'): + rgb = tuple(int(code.lstrip('#')[i:i+2], 16) for i in (0, 2, 4)) + else: + code = code.replace(',', ' ').replace(';', ' ').replace(' ', ' ') + rgb = tuple(int(c) for c in code.split(' ')) + + msg = msg[:i] + ansirgb(*rgb, foreground=fore) + msg[end + 1:] + return msg @@ -28,13 +46,17 @@ def set(): if __name__ == '__main__': - start_time = time.time() - + # start_time = time.time() args = sys.argv[1:] parts_raw = args.pop(0) - parts: List[Tuple[int, str]] = json.loads(parts_raw) if parts_raw != '' else [] cmd = args.pop(0).lower() + if cmd == 'color': + print(replace_color(parts_raw)) + exit() + + parts: list[tuple[int, str]] = json.loads(parts_raw) if parts_raw != '' else [] + if cmd == 'show': show() elif cmd == 'debug': From 1c4dd77f03b44332ef5072797294f81bce53057e Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Thu, 25 Nov 2021 23:19:22 -0500 Subject: [PATCH 04/16] [+] Add colors --- scripts/includes/prompt.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/includes/prompt.sh b/scripts/includes/prompt.sh index a8b7477..4fa1e4d 100755 --- a/scripts/includes/prompt.sh +++ b/scripts/includes/prompt.sh @@ -13,14 +13,20 @@ prompt-set() { prompt-update() { PROMPT=$(prompt-show) } +pcolor() { + tmp="$@" + prompt "$tmp" color +} ########### Build a zsh prompt # New line first prompt-set 0 "&n" # Time stamp prompt-set 10 "&5%D{%a %m-%d %H:%M}&r " +[[ "$HOST" != "HyDEV" ]] && prompt-set 10 "&gf(#55CDFC)%D{%a} &gf(#F7A8B8)%D{%m-}&f%D{%d} &gf(#F7A8B8)%D{%H:}&gf(#55CDFC)%D{%M}&r " # Hostname prompt-set 20 "&1%m&r " +[[ "$HOST" == "HyDEV" ]] && prompt-set 20 "&gf(#55CDFC)H&gf(#F7A8B8)y&fD&gf(#F7A8B8)E&gf(#55CDFC)V&r " # Username, or show a cat if I'm hykilpikonna prompt-set 30 "&e%n&r " [[ "$USER" == "hykilpikonna" ]] && prompt-set 30 "🐱 " From 676a3ab37069df77c10c36bc6544729de985b5ca Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 27 Nov 2021 11:35:59 -0500 Subject: [PATCH 05/16] [O] Compatibility --- scripts/helpers/prompt.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/helpers/prompt.py b/scripts/helpers/prompt.py index 0bb92d5..96a8f0e 100755 --- a/scripts/helpers/prompt.py +++ b/scripts/helpers/prompt.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import json import sys +from __future__ import annotations def ansirgb(r: int, g: int, b: int, foreground: bool = True) -> str: From 318ba7b862a8f448873dd465a37ab39234640436 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 27 Nov 2021 11:36:57 -0500 Subject: [PATCH 06/16] [M] Move compatibility to the beginning --- scripts/helpers/prompt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/helpers/prompt.py b/scripts/helpers/prompt.py index 96a8f0e..f04b3e5 100755 --- a/scripts/helpers/prompt.py +++ b/scripts/helpers/prompt.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 +from __future__ import annotations import json import sys -from __future__ import annotations def ansirgb(r: int, g: int, b: int, foreground: bool = True) -> str: From 0e9f16a44b3043bd4b72a8e8c2004866c66fefaa Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 28 Nov 2021 11:18:26 -0500 Subject: [PATCH 07/16] [+] jctlog --- scripts/includes/application.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/includes/application.sh b/scripts/includes/application.sh index f6e99e7..c88e7c9 100644 --- a/scripts/includes/application.sh +++ b/scripts/includes/application.sh @@ -3,3 +3,6 @@ alias va-restart='sctl restart va' alias va-log-all='jctl -u va --output cat' alias va-log='va-log-all -f' + +# General +alias jctlog='jctl --output cat -f -u' \ No newline at end of file From 892d8a7b1c7318f85316cce6378fb6a7236eb037 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Tue, 7 Dec 2021 19:04:09 -0500 Subject: [PATCH 08/16] [+] Video compression tools --- scripts/.gitignore => .gitignore | 0 scripts/helpers/video.py | 37 ++++++++++++++++++++++++++++++++ scripts/zshrc.sh | 1 + 3 files changed, 38 insertions(+) rename scripts/.gitignore => .gitignore (100%) create mode 100755 scripts/helpers/video.py diff --git a/scripts/.gitignore b/.gitignore similarity index 100% rename from scripts/.gitignore rename to .gitignore diff --git a/scripts/helpers/video.py b/scripts/helpers/video.py new file mode 100755 index 0000000..f90b82d --- /dev/null +++ b/scripts/helpers/video.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python3 +import os +import sys +from datetime import datetime + +if __name__ == '__main__': + args = sys.argv[1:] + if len(args) < 2: + print('Usage: compress [rename/cpu/gpu] [crf=20]') + + # Command to rename all screen recordings + if args[0] == 'rename': + for file in os.listdir('.'): + if file.startswith('Screen Recording ') or file.startswith('Screen Shot '): + pre = 'Rec' if 'Recording' in file else 'Shot' + endIndex = (file.index('AM') if 'AM' in file else file.index('PM')) + 2 + datestr = file[17 if pre == 'Rec' else 12:endIndex] + dt = datetime.strptime(datestr, '%Y-%m-%d at %I.%M.%S %p') + date = dt.strftime(f'{pre} %Y-%m-%d %H-%M' + file[endIndex:]) + + print(f'Renaming {file} to {date}') + os.rename(file, date) + + exit() + + processor = args[0].lower().strip() + i = args[1] + crf = args[2] if len(args) > 2 else '24' + out = i[:i.rindex('.')] + f'.{processor[0]}265' + if processor == 'cpu': + out += f'-{crf}' + out += '.mp4' + + if processor == 'cpu': + os.system(f'ffmpeg -i "{i}" -vcodec libx265 -crf {crf} "{out}"') + if processor == 'gpu': + os.system(f'ffmpeg -i "{i}" -c:v hevc_videotoolbox -b:v 4000k "{out}"') diff --git a/scripts/zshrc.sh b/scripts/zshrc.sh index f7bea75..be31727 100755 --- a/scripts/zshrc.sh +++ b/scripts/zshrc.sh @@ -118,6 +118,7 @@ cut() { echo $start ffmpeg -i $1 -codec copy -ss $start -t $2 Cut\ $1 } +alias vcomp="$SCR/helpers/video.py" # include if it exists [ -f $HOME/extra.rc.sh ] && . $HOME/extra.rc.sh From a2061d377493d747b31e0d0e0a5de1a67636c15c Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 11 Dec 2021 09:58:21 -0500 Subject: [PATCH 09/16] [+] Additional parameters --- scripts/helpers/video.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/helpers/video.py b/scripts/helpers/video.py index f90b82d..f148cd5 100755 --- a/scripts/helpers/video.py +++ b/scripts/helpers/video.py @@ -6,7 +6,7 @@ from datetime import datetime if __name__ == '__main__': args = sys.argv[1:] if len(args) < 2: - print('Usage: compress [rename/cpu/gpu] [crf=20]') + print('Usage: compress [rename/cpu/gpu/cpucmd/gpucmd] [crf=24] [additional args]') # Command to rename all screen recordings if args[0] == 'rename': @@ -27,11 +27,20 @@ if __name__ == '__main__': i = args[1] crf = args[2] if len(args) > 2 else '24' out = i[:i.rindex('.')] + f'.{processor[0]}265' + cmd = 'cmd' in processor + if cmd: + processor = processor.replace('cmd', '') if processor == 'cpu': out += f'-{crf}' out += '.mp4' + additional_args = ' '.join(args[3:] if len(args) > 3 else []) if processor == 'cpu': - os.system(f'ffmpeg -i "{i}" -vcodec libx265 -crf {crf} "{out}"') + c = f'ffmpeg -i "{i}" -vcodec libx265 -crf {crf} {additional_args} "{out}"' if processor == 'gpu': - os.system(f'ffmpeg -i "{i}" -c:v hevc_videotoolbox -b:v 4000k "{out}"') + c = f'ffmpeg -i "{i}" -c:v hevc_videotoolbox -b:v 1000k {additional_args} "{out}"' + + if cmd: + print(c) + else: + os.system() \ No newline at end of file From 01bae45915d05ddb79b91767b1cc23dde78e6563 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 11 Dec 2021 19:41:05 -0500 Subject: [PATCH 10/16] [O] Use python function structure for vcomp --- scripts/helpers/video.py | 96 +++++++++++++++++++++++++++------------- scripts/zshrc.sh | 1 + 2 files changed, 66 insertions(+), 31 deletions(-) diff --git a/scripts/helpers/video.py b/scripts/helpers/video.py index f148cd5..44b3e5c 100755 --- a/scripts/helpers/video.py +++ b/scripts/helpers/video.py @@ -3,44 +3,78 @@ import os import sys from datetime import datetime -if __name__ == '__main__': - args = sys.argv[1:] - if len(args) < 2: - print('Usage: compress [rename/cpu/gpu/cpucmd/gpucmd] [crf=24] [additional args]') - # Command to rename all screen recordings - if args[0] == 'rename': - for file in os.listdir('.'): - if file.startswith('Screen Recording ') or file.startswith('Screen Shot '): - pre = 'Rec' if 'Recording' in file else 'Shot' - endIndex = (file.index('AM') if 'AM' in file else file.index('PM')) + 2 - datestr = file[17 if pre == 'Rec' else 12:endIndex] - dt = datetime.strptime(datestr, '%Y-%m-%d at %I.%M.%S %p') - date = dt.strftime(f'{pre} %Y-%m-%d %H-%M' + file[endIndex:]) +def comp(input: str = 'latest', proc: str = 'cpu', codec: str = 'x264', crf: int = 24, + cmd: bool = False, aargs: str = '', suffix: str = 'mp4'): + """ + Compress video - print(f'Renaming {file} to {date}') - os.rename(file, date) + :param input: Input file (Default: latest) + :param proc: cpu (c) or gpu (g) + :param codec: x264 (4) or x265 (5) + :param crf: CRF (quality) for cpu encoding + :param cmd: Whether to output command directly + :param aargs: Additional args + :param suffix: File suffix (Default mp4) + :return: + """ + if input == 'latest': + rename() + i = sorted([s for s in os.listdir('.') if s.startswith('Rec') and s.endswith('mov')])[-1] + else: + i = input - exit() + proc = proc[0] + codec = {'4': {'c': 'x264', 'g': 'h264'}, '5': {'c': 'x265', 'g': 'hevc'}}[codec[-1]][proc] - processor = args[0].lower().strip() - i = args[1] - crf = args[2] if len(args) > 2 else '24' - out = i[:i.rindex('.')] + f'.{processor[0]}265' - cmd = 'cmd' in processor - if cmd: - processor = processor.replace('cmd', '') - if processor == 'cpu': + out = i[:i.rindex('.')] + f'.{codec}' + if proc == 'c': out += f'-{crf}' - out += '.mp4' - additional_args = ' '.join(args[3:] if len(args) > 3 else []) + out += f'.{suffix}' - if processor == 'cpu': - c = f'ffmpeg -i "{i}" -vcodec libx265 -crf {crf} {additional_args} "{out}"' - if processor == 'gpu': - c = f'ffmpeg -i "{i}" -c:v hevc_videotoolbox -b:v 1000k {additional_args} "{out}"' + if proc == 'c': + c = f'ffmpeg -i "{i}" -vcodec lib{codec} -crf {crf} {aargs} "{out}"' + elif proc == 'g': + c = f'ffmpeg -i "{i}" -c:v {codec}_videotoolbox -b:v 1000k {aargs} "{out}"' + else: + raise AssertionError(f'Processor is invalid ({codec}[0] not in "cg")') if cmd: print(c) else: - os.system() \ No newline at end of file + os.system(c) + + +def rename(): + for file in os.listdir('.'): + if file.startswith('Screen Recording ') or file.startswith('Screen Shot '): + pre = 'Rec' if 'Recording' in file else 'Shot' + end_index = (file.index('AM') if 'AM' in file else file.index('PM')) + 2 + datestr = file[17 if pre == 'Rec' else 12:end_index] + dt = datetime.strptime(datestr, '%Y-%m-%d at %I.%M.%S %p') + date = dt.strftime(f'{pre} %Y-%m-%d %H-%M' + file[end_index:]) + + print(f'Renaming {file} to {date}') + os.rename(file, date) + + +if __name__ == '__main__': + if not hasattr(sys, 'ps1'): + args = sys.argv[1:] + if len(args) < 1: + print('Usage: compress [rename/python code]') + + # Command to rename all screen recordings + if args[0] == 'rename': + rename() + exit() + + # processor = args[0].lower().strip() + # i = args[1] + # crf = args[2] if len(args) > 2 else '24' + # cmd = 'cmd' in processor + # if cmd: + # processor = processor.replace('cmd', '') + + # additional_args = ' '.join(args[3:] if len(args) > 3 else []) + print(eval(' '.join(args[0:]))) diff --git a/scripts/zshrc.sh b/scripts/zshrc.sh index be31727..90e8afa 100755 --- a/scripts/zshrc.sh +++ b/scripts/zshrc.sh @@ -119,6 +119,7 @@ cut() { ffmpeg -i $1 -codec copy -ss $start -t $2 Cut\ $1 } alias vcomp="$SCR/helpers/video.py" +alias vcompy="ipython -i $SCR/helpers/video.py" # include if it exists [ -f $HOME/extra.rc.sh ] && . $HOME/extra.rc.sh From d79f1ce3602c3fdcd4252d69bbf1a7437dee51f6 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 12 Dec 2021 21:47:49 -0500 Subject: [PATCH 11/16] [+] Ubuntu setup --- ubuntu_setup.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 ubuntu_setup.sh diff --git a/ubuntu_setup.sh b/ubuntu_setup.sh new file mode 100644 index 0000000..edb78f1 --- /dev/null +++ b/ubuntu_setup.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# Automatically setup ubuntu + +# Install essential packages +apt update +apt install curl git net-tools -y + +# Add ssh keys +mkdir ~/.ssh +curl -L https://github.com/Hykilpikonna.keys > ~/.ssh/authorized_keys + +# Install zsh +apt install zsh -y +chsh -s /bin/zsh + +# Install zshrc +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Hykilpikonna/zshrc/HEAD/fastinstall.sh)" + +# Install shadowsocks +apt install shadowsocks-libev -y +git clone https://github.com/hykilpikonna/HyDEV-Proxy +mkdir /etc/shadowsocks-libev +cp -f ./HyDEV-Proxy/ss-server.json /etc/shadowsocks-libev/hydev.json +systemctl stop shadowsocks-libev +systemctl disable shadowsocks-libev +systemctl start shadowsocks-libev-server@hydev.service +systemctl enable shadowsocks-libev-server@hydev.service From d6f1481623e37a8da40685cd83710af20c183401 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 12 Dec 2021 22:03:51 -0500 Subject: [PATCH 12/16] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index c137cb1..01dc81a 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,8 @@ My zshrc ```sh /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Hykilpikonna/zshrc/HEAD/fastinstall.sh)" ``` + +## Ubuntu fast setup +```sh +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Hykilpikonna/zshrc/HEAD/ubuntu_setup.sh)" +``` From 5bc67f44f848f27b00501e707983350475ec7c5a Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Wed, 15 Dec 2021 23:21:36 -0500 Subject: [PATCH 13/16] [+] Add br option --- scripts/helpers/video.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/helpers/video.py b/scripts/helpers/video.py index 44b3e5c..9f167db 100755 --- a/scripts/helpers/video.py +++ b/scripts/helpers/video.py @@ -4,7 +4,7 @@ import sys from datetime import datetime -def comp(input: str = 'latest', proc: str = 'cpu', codec: str = 'x264', crf: int = 24, +def comp(input: str = 'latest', proc: str = 'cpu', codec: str = 'x264', crf: int = 24, br: int = 500, cmd: bool = False, aargs: str = '', suffix: str = 'mp4'): """ Compress video @@ -35,7 +35,7 @@ def comp(input: str = 'latest', proc: str = 'cpu', codec: str = 'x264', crf: int if proc == 'c': c = f'ffmpeg -i "{i}" -vcodec lib{codec} -crf {crf} {aargs} "{out}"' elif proc == 'g': - c = f'ffmpeg -i "{i}" -c:v {codec}_videotoolbox -b:v 1000k {aargs} "{out}"' + c = f'ffmpeg -i "{i}" -c:v {codec}_videotoolbox -b:v {br}k {aargs} "{out}"' else: raise AssertionError(f'Processor is invalid ({codec}[0] not in "cg")') From 902125a2f5110d76e6ee7db536e221622ac34c6f Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Thu, 16 Dec 2021 00:16:51 -0500 Subject: [PATCH 14/16] [U] Update minecraft jvm --- scripts/includes/home-mac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/includes/home-mac.sh b/scripts/includes/home-mac.sh index 6da5cfe..a51d481 100644 --- a/scripts/includes/home-mac.sh +++ b/scripts/includes/home-mac.sh @@ -2,7 +2,7 @@ if [[ $OSTYPE == 'darwin'* ]] && [ -d "/Volumes/External" ]; then # Minecraft export MC_DIR="/Volumes/External/Minecraft" - alias minecraft="pushd $MC_DIR; java8 -jar $MC_DIR/HMCL-*.jar; popd" + alias minecraft="pushd $MC_DIR; java17 -jar $MC_DIR/HMCL-*.jar; popd" # Paths export PATH="$PATH:/Users/hykilpikonna/.pyenv/versions/3.8.0/bin" From 4d2dcb4a23f7a138f5a6b49bf189028856aa1342 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Tue, 21 Dec 2021 16:56:36 -0500 Subject: [PATCH 15/16] [+] Add services --- brew-services/homebrew.mxcl.frpc.plist | 22 ++++++++++++++++++++++ brew-services/homebrew.mxcl.menu-bot.plist | 21 +++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 brew-services/homebrew.mxcl.frpc.plist create mode 100644 brew-services/homebrew.mxcl.menu-bot.plist diff --git a/brew-services/homebrew.mxcl.frpc.plist b/brew-services/homebrew.mxcl.frpc.plist new file mode 100644 index 0000000..9756a78 --- /dev/null +++ b/brew-services/homebrew.mxcl.frpc.plist @@ -0,0 +1,22 @@ + + + + + KeepAlive + + Label + homebrew.mxcl.frpc + ProgramArguments + + /usr/local/opt/frpc/bin/frpc + -c + /usr/local/etc/frp/frpc.ini + + RunAtLoad + + StandardErrorPath + /usr/local/var/log/frpc.log + StandardOutPath + /usr/local/var/log/frpc.log + + diff --git a/brew-services/homebrew.mxcl.menu-bot.plist b/brew-services/homebrew.mxcl.menu-bot.plist new file mode 100644 index 0000000..8bbeef3 --- /dev/null +++ b/brew-services/homebrew.mxcl.menu-bot.plist @@ -0,0 +1,21 @@ + + + + + KeepAlive + + Label + homebrew.mxcl.menu-bot + ProgramArguments + + /usr/bin/python3 + /Volumes/macWorkspace/CS/CSC110/menubot/menubot.py + + RunAtLoad + + StandardErrorPath + /usr/local/var/log/menubot.log + StandardOutPath + /usr/local/var/log/menubot.log + + \ No newline at end of file From a2945985ae722e89bc1fdbe95e0fb05ad0a101e7 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Wed, 22 Dec 2021 02:00:20 -0500 Subject: [PATCH 16/16] [+] Python paths --- scripts/includes/home-mac.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/includes/home-mac.sh b/scripts/includes/home-mac.sh index a51d481..5b3fb79 100644 --- a/scripts/includes/home-mac.sh +++ b/scripts/includes/home-mac.sh @@ -5,7 +5,6 @@ if [[ $OSTYPE == 'darwin'* ]] && [ -d "/Volumes/External" ]; then alias minecraft="pushd $MC_DIR; java17 -jar $MC_DIR/HMCL-*.jar; popd" # Paths - export PATH="$PATH:/Users/hykilpikonna/.pyenv/versions/3.8.0/bin" export DOTNET_ROOT="/usr/local/opt/dotnet/libexec" # export PATH="/Volumes/MacData/SageMath:$PATH" export PATH="$PATH:/Users/hykilpikonna/.gem/ruby/2.6.0/bin" # https://stackoverflow.com/a/53388305/7346633 @@ -14,4 +13,10 @@ if [[ $OSTYPE == 'darwin'* ]] && [ -d "/Volumes/External" ]; then export PATH="${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools" export NDK_HOME="/Volumes/MacData/Resources/android-ndk-r21d" export NDK_ROOT=$NDK_HOME + export PATH="/usr/local/opt/node@14/bin:$PATH" + + # Use Python3.9 by default + export PATH="/usr/local/opt/python@3.8/bin:$PATH" + export PATH="/usr/local/opt/python@3.10/bin:$PATH" + export PATH="/usr/local/opt/python@3.9/bin:$PATH" fi