diff --git a/.backup/brew_packages b/.backup/brew_packages index 900a9db..e69de29 100644 --- a/.backup/brew_packages +++ b/.backup/brew_packages @@ -1,222 +0,0 @@ -annie -aom -apache-flink -apr -apr-util -argon2 -aspell -autoconf -autojump -automake -bash -bat -bdw-gc -brew-php-switcher -brotli -c-ares -cairo -cargo-c -ccache -cmake -cocoapods -composer -curl -curl-openssl -dav1d -dnsmasq -dos2unix -exa -faac -fdk-aac -ffmpeg -flac -fontconfig -freetds -freetype -frei0r -fribidi -fzf -gawk -gcc -gd -gdbm -geoip -gettext -giflib -git -git-flow-avh -glib -gmp -gnu-getopt -gnu-sed -gnutls -go -gobject-introspection -gphotos-uploader-cli -gradle -graphite2 -groovy -guetzli -guile -harfbuzz -htop -httpd -hugo -icu4c -ideviceinstaller -imageoptim-cli -ios-deploy -isl -jansson -jemalloc -jenv -jpeg -jq -krb5 -lame -leptonica -libass -libav -libbluray -libev -libevent -libffi -libgcrypt -libgit2 -libgpg-error -libidn -libidn2 -libimobiledevice -libmetalink -libmpc -libogg -libplist -libpng -libpq -libsamplerate -libsndfile -libsodium -libsoxr -libssh2 -libtasn1 -libtermkey -libtiff -libtool -libunistring -libusb -libusbmuxd -libuv -libvidstab -libvorbis -libvpx -libvterm -libxml2 -libyaml -libzip -little-cms2 -lrzsz -lua -luajit -lz4 -lzo -make -maven -mcrypt -media-info -mercurial -meson -mhash -mongodb-community -mongodb-database-tools -mpfr -msgpack -mtr -mycli -mysql-client -mysql@5.7 -nasm -navi -ncurses -neovim -nettle -nghttp2 -nginx -ninja -node -node@10 -nvm -oniguruma -opencore-amr -openjdk -openjdk@11 -openjpeg -openldap -openresty -openresty-openssl -openresty-openssl111 -openssl@1.1 -opus -p11-kit -pcre -pcre2 -percona-xtrabackup -perl -php -php@7.1 -pixman -pkg-config -popt -proxychains-ng -python -python@2 -python@3.7 -python@3.8 -python@3.9 -qpdf -rav1e -re2c -readline -redis -rename -rsync -rtmpdump -rubberband -ruby -rust -sdl -sdl2 -snappy -speex -sphinx-doc -sqlite -srt -supervisor -swig -telnet -terminal-notifier -tesseract -texi2html -theora -tidy-html5 -tomcat@7 -tree -unbound -unibilium -unixodbc -usbmuxd -vim -webp -wget -x264 -x265 -xvid -xxhash -xz -yadm -yarn -you-get -youtube-dl -zeromq -zsh-history-substring-search -zsh-syntax-highlighting -zstd diff --git a/.backup/crontab-20201221-070100.gz b/.backup/crontab-20201221-070100.gz new file mode 100644 index 0000000..f863e5a Binary files /dev/null and b/.backup/crontab-20201221-070100.gz differ diff --git a/.backup/crontab-20201222-070100.gz b/.backup/crontab-20201222-070100.gz new file mode 100644 index 0000000..c92307c Binary files /dev/null and b/.backup/crontab-20201222-070100.gz differ diff --git a/.zsh_history b/.zsh_history index 9008374..ace5f5e 100644 --- a/.zsh_history +++ b/.zsh_history @@ -52,9 +52,6 @@ : 1553786776:0;cd /usr/local/Cellar/php@7.1/7.1.27/bin : 1553786831:0;/usr/local/Cellar/php@7.1/7.1.27/bin/php -v : 1553786844:0;brew info php -: 1553786861:0;brew info php@7.1 -: 1553786899:0;echo 'export PATH="/usr/local/opt/php@7.1/bin:$PATH"' >> ~/.zshrc -: 1553786906:0;echo 'export PATH="/usr/local/opt/php@7.1/sbin:$PATH"' >> ~/.zshrc : 1553786916:0;pecl : 1553787128:0;cd /usr/local/Cellar/php@7.1/7.1.27/ : 1553787148:0;sudo pecl install xdebug @@ -1504,7 +1501,6 @@ done : 1561433392:0;git clone https://github.com/lxerxa/actionview.git actionview : 1561433827:0;pecl install mangodb : 1561433848:0;/usr/local/Cellar/php@7.1/7.1.30_1/bin/pecl install mongodb -: 1561434101:0;which php : 1561434110:0;ls /usr/bin/php : 1561434117:0;ls alh /usr/bin/php : 1561434125:0;ls -alh /usr/bin/php @@ -5290,7 +5286,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1587741244:0;cp app/Services/XiuGirlsService.php app/Services/NewXiuGirlsService.php : 1587741582:0;cd ci : 1587741586:0;cd icu -: 1587741605:0;brew upgrade php@7.1 : 1587741640:0;/usr/local/Cellar/php/7.4.5_2/bin/php artisan xiu:get -v : 1587741879:0;node -version : 1587741966:0;brew uninstall --ignore-dependencies icu4c @@ -5307,7 +5302,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1587742390:0;wget https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles/bottles/icu4c-64.2.mojave.bottle.tar.gz : 1587742417:0;mkdir icu4c : 1587742475:0;tar -zxvf icu4c-64.2.mojave.bottle.tar.gz icu4c/ -: 1587742492:0;cd 64.2 : 1587742634:0;cp *.64.dylib /usr/local/opt/icu4c/lib : 1587742639:0;php -version : 1587826373:0;cd src/ @@ -5977,7 +5971,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1591269696:0;cd pkgconfig : 1591269827:0;cd ,.. : 1591269833:0;cd icu4c -: 1591269903:0;cd 67.1 : 1591269906:0;cd lib : 1591270323:0;brew install icu4c@64 : 1591270468:0;gco -b icu4c-64 896d1018c7a4906f2c3fa1386aaf283497db60a2 @@ -5992,7 +5985,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1591321251:0;composer require mhor/php-mediainfo : 1591321289:0;php composer require mhor/php-mediainfo : 1591321296:0;which composer -: 1591321467:0;cd /usr/local/Cellar/icu4c/ : 1591321688:0;brew switch icu4c 64.2 : 1591321711:0;php /usr/local/bin/composer require mhor/php-mediainfo : 1591321746:0;php /usr/local/bin/composer require mhor/php-mediainfo -vvv @@ -6032,7 +6024,6 @@ curl -L "https://t1.daumcdn.net/cfile/tistory/993D02425DE6416F2A" -o "僻 : 1591602304:0;valet restart : 1591602370:0;valet use php@7.1 : 1591605220:0;composer global update -vvv -: 1591608309:0;php -m : 1591609509:0;php -i : 1591609535:0;php -i aaa : 1591667082:0;mv JD_DailyBonus.js JD_DailyBonus.js.2020年06惼09惷.back @@ -6798,7 +6789,6 @@ done : 1598852165:0;cd ~/Documents/tmp/rainbow : 1598882158:0;php artisan make:command TujiguCommand : 1598884017:0;mv JD_DailyBonus.js JD_DailyBonus.js.2020年08惼31惷.back -: 1598926013:0;php : 1598926648:0;cd ~/Downloads/us.sitesucker.mac.sitesucker/www.tujigu.com : 1598926691:0;cd a : 1598926747:0;cd 。。 @@ -6973,81 +6963,21 @@ done : 1600963158:0;mkdir girlsday : 1600963161:0;cd girlsday : 1600963189:0;youtube-dl -i -f 'bestvideo[ext=webm]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 --yes-playlist --playlist-start 1 --playlist-end 300 https://www.youtube.com/playlist\?list\=PLy1oKOcA48FXiI2Fy2k4-08Ja3Zd0VskG -: 1601011174:0;brew update -v -: 1601020060:0;php artisan rename:test -v -: 1601027717:0;cd ~ -: 1601027906:0;php -v -: 1601045611:0;cd - -: 1601045615:0;youtube-dl -i -f 'bestvideo[ext=webm]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 --yes-playlist --playlist-start 175 --playlist-end 300 https://www.youtube.com/playlist\?list\=PLy1oKOcA48FXiI2Fy2k4-08Ja3Zd0VskG -: 1601107164:0;cd ~ -: 1601121819:0;./2.sh -: 1601122720:0;eproxy php artisan xiu:get -v : 1601123426:0;hexo new draft "僼老七人家烺尃工记七" -: 1601124101:0;php artisan nvshen:get -v -: 1601124957:0;cd - -: 1601124960:0;youtube-dl -i -f 'bestvideo[ext=webm]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 --yes-playlist --playlist-start 175 --playlist-end 300 https://www.youtube.com/playlist\?list\=PLy1oKOcA48FXiI2Fy2k4-08Ja3Zd0VskG -: 1601127084:0;php artisan tujigu:s : 1601135281:0;hexo publish '僼老七人家烺尃工记僻' -: 1601135294:0;hexo clean && hexo g && hexo s --debug -: 1601135345:0;hexo d --debug -: 1601135601:0;php artisan tujigu:s -: 1601167431:0;ssh shixuesen@35.197.158.30 -: 1601170810:0;eproxy : 1601170814:0;cd /Volumes/WD/VideoCollection/girlsday : 1601170817:0;youtube-dl -i -f 'bestvideo[ext=webm]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 --yes-playlist --playlist-start 175 --playlist-end 300 https://www.youtube.com/playlist\?list\=PLy1oKOcA48FXiI2Fy2k4-08Ja3Zd0VskG -: 1601170977:0;ins -: 1601170979:0;php artisan tujigu:s -: 1601176071:0;gst -: 1601176072:0;gl -: 1601176076:0;gco master -: 1601176077:0;gl -: 1601183461:0;brew update -v -: 1601183506:0;exit -: 1601183594:0;ins -: 1601183597:0;php artisan nvshen:get -v : 1601183647:0;ping www.nvshens.org : 1601183780:0;curl --version : 1601183790:0;php --ri curl : 1601183903:0;brew uninstall curl-openssl --ignore-dependencies\ -: 1601183921:0;brew services list : 1601183946:0;brew services restart php@7.1 -: 1601183952:0;php artisan nvshen:get -v -: 1601184428:0;php artisan tujigu:s -: 1601185158:0;ssh jump : 1601188383:0;ping xsnvshen.com -: 1601193785:0;php artisan handle:video -: 1601194883:0;gst -: 1601194886:0;gl -: 1601194890:0;gco feature/yet_another_early_learning -: 1601194892:0;gl -: 1601195035:0;gst -: 1601205012:0;youtube-dl -i -f 'bestvideo[ext=webm]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 --yes-playlist --playlist-start 249 --playlist-end 300 https://www.youtube.com/playlist\?list\=PLy1oKOcA48FXiI2Fy2k4-08Ja3Zd0VskG -: 1601210524:0;cd ~ -: 1601218432:0;ssh shixuesen@35.194.184.81 -: 1601218447:0;ping 35.194.184.81 -: 1601218465:0;exit -: 1601220649:0;cd - : 1601220653:0;youtube-dl -i -f 'bestvideo[ext=webm]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 --yes-playlist --playlist-start 249 --playlist-end 300 https://www.youtube.com/playlist\?list\=PLy1oKOcA48FXiI2Fy2k4-08Ja3Zd0VskG : 1601221305:0;hexo new draft "Apollo 烺 value 注解惸怃乃胧僪惻惶烺" -: 1601254709:0;cd ~ -: 1601257128:0;ssh shixuesen@35.194.184.81 -: 1601257706:0;gst -: 1601257712:0;git add . : 1601257719:0;git commit -m "temp add" -: 1601257724:0;gp -: 1601257729:0;gl : 1601257750:0;gco feature/for_windows_video_compress_sxs20200923 -: 1601257759:0;gco - -: 1601257760:0;gl -: 1601258447:0;php artisan handle:video -: 1601258631:0;cd - -: 1601258656:0;youtube-dl -i -f 'bestvideo[ext=webm]+bestaudio[ext=m4a]/bestvideo+bestaudio' --merge-output-format mp4 --yes-playlist --playlist-start 301 --playlist-end 465 https://www.youtube.com/playlist\?list\=PLy1oKOcA48FXiI2Fy2k4-08Ja3Zd0VskG -: 1601260208:0;gst -: 1601260212:0;git add . -: 1601260214:0;git stash -: 1601260217:0;gl -: 1601260266:0;gst : 1601260270:0;git stash pop : 1601262185:0;crontab -l : 1601262265:0;crontab -e @@ -10612,3 +10542,50 @@ done : 1608273683:0;txy2 : 1608301061:0;ping www.baidu.com : 1608335786:0;php artisan xiuren:s +: 1608470542:0;php -v +: 1608470548:0;brew update -v +: 1608470597:0;brew upgrade -v +: 1608470818:0;php -v +: 1608470841:0;cd /usr/local/Cellar/php@7.1/7.1.32_1 +: 1608470843:0;cd ~ +: 1608470847:0;which php +: 1608471688:0;cat ~/.zshrc| grep php +: 1608471697:0;vim ~/.zshrc +: 1608471741:0;source ~/.zshrc +: 1608471748:0;php -v +: 1608471757:0;which php +: 1608471780:0;brew list | grep php +: 1608471797:0;brew info php@7.1 +: 1608472226:0;php +: 1608472249:0;/usr/local/Cellar/php@7.1/7.1.33.reinstall/bin/php -v +: 1608472260:0;/usr/local/Cellar/php@7.1/7.1.33.reinstall/bin/php artisan xiuren:s +: 1608472393:0;brew link +: 1608472513:0;brew upgrade php@7.1 +: 1608472816:0;brew link --overwrite php@7.1 +: 1608472828:0;php -v +: 1608472841:0;brew link php@7.1 +: 1608472851:0;brew unlink php@7.1 +: 1608472868:0;brew link php@7.1 +: 1608472876:0;php -v +: 1608472895:0;vim ~/.zshrc +: 1608472936:0;echo 'export PATH="/usr/local/opt/php@7.1/bin:$PATH"' >> ~/.zshrc +: 1608472944:0;echo 'export PATH="/usr/local/opt/php@7.1/sbin:$PATH"' >> ~/.zshrc +: 1608472946:0;php -v +: 1608473326:0;which php +: 1608473358:0;alias mi +: 1608473361:0;alias +: 1608473383:0;vim ~/.zshrc +: 1608473402:0;unalias php +: 1608473405:0;php -v +: 1608477525:0;hexo publish "仃丁仲礼胂羃僻僨裁聃点僵" +: 1608477533:0;hexo clean && hexo g && hexo s --debug +: 1608477586:0;hexo d --debug +: 1608515391:0;php -v +: 1608515420:0;php artisan xiuren:s +: 1608515425:0;exit +: 1608515452:0;php artisan xiuren:s +: 1608516279:0;txy2 +: 1608520973:0;php artisan ins:like +: 1608526677:0;php artisan rename:test -v +: 1608539299:0;ll +: 1608565070:0;php artisan ins:like diff --git a/.zshrc b/.zshrc index 6e5e9ab..a195943 100644 --- a/.zshrc +++ b/.zshrc @@ -106,7 +106,7 @@ alias pr1="ssh root@155.94.184.27" alias uc1="ssh ubuntu@152.32.187.149" alias gcp1="ssh shixuesen@35.221.158.39" alias vim="nvim" -alias php="/usr/local/Cellar/php@7.1/7.1.33/bin/php" +#alias php="/usr/local/Cellar/php@7.1/7.1.33/bin/php" alias dev="cd /Users/shixuesen/workspace/dev" alias www="cd /Users/shixuesen/workspace/data/www1" alias pyoutube-dl="export http_proxy=http://127.0.0.1:1087;export https_proxy=http://127.0.0.1:1087; youtube-dl" @@ -164,3 +164,5 @@ export PATH="/usr/local/opt/python@3.7/bin:$PATH" . /Users/shixuesen/workspace/dev/src/z/z.sh autoload -U +X bashcompinit && bashcompinit complete -o nospace -C /usr/local/bin/bitcomplete bit +export PATH="/usr/local/opt/php@7.1/bin:$PATH" +export PATH="/usr/local/opt/php@7.1/sbin:$PATH"