From 18520bea9760c1ec3c9022bcc87aff5ae1f2c63a Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:05:48 -0400 Subject: [PATCH 1/2] api: add `remove_deprecated_app` and `userinput_func` functions also remove deprecated apps: Email Checker Pi-Apps Terminal Plugin (python) Sysmon BlockPi --- api | 75 ++++++++++++++++++ apps/BlockPi/credits | 1 - apps/BlockPi/description | 5 -- apps/BlockPi/icon-24.png | Bin 1210 -> 0 bytes apps/BlockPi/icon-64.png | Bin 2822 -> 0 bytes apps/BlockPi/install-32 | 10 --- apps/BlockPi/install-64 | 11 --- apps/BlockPi/uninstall | 3 - apps/BlockPi/website | 1 - apps/Email Checker/description | 4 - apps/Email Checker/icon-24.png | Bin 409 -> 0 bytes apps/Email Checker/icon-64.png | Bin 796 -> 0 bytes apps/Email Checker/install | 50 ------------ apps/Email Checker/uninstall | 10 --- apps/Email Checker/website | 1 - apps/Pi-Apps Terminal Plugin (python)/credits | 1 - .../description | 17 ---- .../icon-24.png | Bin 1099 -> 0 bytes .../icon-64.png | Bin 1444 -> 0 bytes .../install-32 | 11 --- .../uninstall | 8 -- apps/Pi-Apps Terminal Plugin (python)/website | 1 - apps/Sysmon/credits | 2 - apps/Sysmon/description | 6 -- apps/Sysmon/icon-24.png | Bin 753 -> 0 bytes apps/Sysmon/icon-64.png | Bin 1504 -> 0 bytes apps/Sysmon/install | 25 ------ apps/Sysmon/uninstall | 7 -- apps/Sysmon/website | 1 - etc/categories | 4 - etc/category-overrides-jetson-18.04 | 1 - etc/category-overrides-non-raspberry | 1 - etc/runonce-entries | 35 +++++--- 33 files changed, 98 insertions(+), 193 deletions(-) delete mode 100644 apps/BlockPi/credits delete mode 100644 apps/BlockPi/description delete mode 100644 apps/BlockPi/icon-24.png delete mode 100644 apps/BlockPi/icon-64.png delete mode 100755 apps/BlockPi/install-32 delete mode 100755 apps/BlockPi/install-64 delete mode 100755 apps/BlockPi/uninstall delete mode 100644 apps/BlockPi/website delete mode 100644 apps/Email Checker/description delete mode 100644 apps/Email Checker/icon-24.png delete mode 100644 apps/Email Checker/icon-64.png delete mode 100755 apps/Email Checker/install delete mode 100755 apps/Email Checker/uninstall delete mode 100644 apps/Email Checker/website delete mode 100644 apps/Pi-Apps Terminal Plugin (python)/credits delete mode 100644 apps/Pi-Apps Terminal Plugin (python)/description delete mode 100644 apps/Pi-Apps Terminal Plugin (python)/icon-24.png delete mode 100644 apps/Pi-Apps Terminal Plugin (python)/icon-64.png delete mode 100755 apps/Pi-Apps Terminal Plugin (python)/install-32 delete mode 100755 apps/Pi-Apps Terminal Plugin (python)/uninstall delete mode 100644 apps/Pi-Apps Terminal Plugin (python)/website delete mode 100644 apps/Sysmon/credits delete mode 100644 apps/Sysmon/description delete mode 100644 apps/Sysmon/icon-24.png delete mode 100644 apps/Sysmon/icon-64.png delete mode 100755 apps/Sysmon/install delete mode 100755 apps/Sysmon/uninstall delete mode 100644 apps/Sysmon/website diff --git a/api b/api index 830fbe38d5..96d484bcc5 100755 --- a/api +++ b/api @@ -757,6 +757,33 @@ pipx_uninstall() { sudo PIPX_HOME=/usr/local/pipx PIPX_BIN_DIR=/usr/local/bin pipx uninstall "$@" || error "Failed to uninstall $* with pipx" } +remove_deprecated_app() { # prompts a user to uninstall a deprecated pi-apps application and then removes the application folder if it exists + local app="$1" # on app name + local removal_arch="$2" # 32 or 64 to only remove one architecture if specified + [ -z "$app" ] && error "remove_deprecated_app(): requires an pi-apps app name" + local app_status="$(app_status "${app}")" + if [ ! -z "$removal_arch" ] && [ "$arch" == "$removal_arch" ] && [ -d "${DIRECTORY}/apps/$app" ] && [ "$app_status" == "installed" ]; then + local text="Pi-Apps has deprecated $app for ${removal_arch}-bit OSs which you currently have installed. +Would you like to uninstall it now or leave it installed? You will NOT be able to uninstall $app with pi-apps later." + userinput_func "$text" "Uninstall now" "Leave installed" + elif [ ! -z "$removal_arch" ] && [ "$arch" != "$removal_arch" ]; then + rm -f "${DIRECTORY}/apps/$app/install-$removal_arch" + return 0 + elif [ -z "$removal_arch" ] && [ -d "${DIRECTORY}/apps/$app" ] && [ "$app_status" == "installed" ]; then + local text="Pi-Apps has deprecated $app which you currently have installed. +Would you like to uninstall it now or leave it installed? You will NOT be able to uninstall $app with pi-apps later." + userinput_func "$text" "Uninstall now" "Leave installed" + else + rm -rf "${DIRECTORY}/apps/$app" + return 0 + fi + if [ "$output" == "Uninstall now" ]; then + "${DIRECTORY}/manage" uninstall "$app" + fi + rm -rf "${DIRECTORY}/apps/$app" + return 0 +} + terminal_manage() { # wrapper for the original terminal_manage function to terminal_mange_multi action="$1" app="$2" #one app name @@ -1377,6 +1404,54 @@ ${category}" fi } +userinput_func() { # userinput function to display yad/cli prompts to the user + [ -z "$1" ] && error "userinput_func(): requires a description" + [ -z "$2" ] && error "userinput_func(): requires at least one output selection option" + local text_lines=$(echo -e "$1" | wc -l) + # there is no good universal way to calculate the required height of the window + # the users theme, default text size, and window scaling all affect it + # the idea is the height should be a function of the number of lines of input text and the number of list options + local height_list=$(echo $(( text_lines * 17 + $(( ${#@} - 1 )) * 29 + 65 ))) + local commonflags=(--fixed --no-escape --undecorated --center --borders=20) + if [ "${#@}" == "2" ];then + yad "${yadflags[@]}" "${commonflags[@]}" \ + --image "dialog-information" \ + --text="$1" \ + --button="$2":0 + output="$2" + elif [ "${#@}" == "3" ];then + yad "${yadflags[@]}" "${commonflags[@]}" \ + --image "dialog-question" \ + --text="$1" \ + --button="$2":0 \ + --button="$3":1 + if [ $? -ne 0 ]; then + output="$3" + else + output="$2" + fi + else + unset uniq_selection + for string in "${@:2}"; do + local uniq_selection+=(FALSE "$string") + done + local uniq_selection[0]=TRUE + output=$(yad "${yadflags[@]}" "${commonflags[@]}" \ + --height=$height_list\ + --text "$1" \ + --list \ + --no-headers \ + --radiolist \ + --center \ + --column "" \ + --column "Selection" \ + --print-column=2 \ + --separator='' \ + --button="OK":0 \ + "${uniq_selection[@]}") + fi +} + generate_app_icons() { #This converts the given $1 image into icon-24.png and icon-64.png files for the $2 app icon="$1" app="$2" diff --git a/apps/BlockPi/credits b/apps/BlockPi/credits deleted file mode 100644 index 0581342d49..0000000000 --- a/apps/BlockPi/credits +++ /dev/null @@ -1 +0,0 @@ -Botspot made the app's install scripts diff --git a/apps/BlockPi/description b/apps/BlockPi/description deleted file mode 100644 index d70f6ffc87..0000000000 --- a/apps/BlockPi/description +++ /dev/null @@ -1,5 +0,0 @@ -Create python programs using drag-n-drop blocks -A visual programming editor app for Raspberry Pi, built on Google Blockly, made for RPi users or kids to learn coding. - -To run: Menu -> Programming -> BlockPi -To run in a terminal: /opt/BlockPi/blockpi diff --git a/apps/BlockPi/icon-24.png b/apps/BlockPi/icon-24.png deleted file mode 100644 index cf2a4063af50d64aee979148421a953d19f8e494..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1210 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 V41>3CHlG*(Gb1a*1_ON3e*nz70sa60 diff --git a/apps/BlockPi/install-32 b/apps/BlockPi/install-32 deleted file mode 100755 index b9bee5af84..0000000000 --- a/apps/BlockPi/install-32 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -for i in python3-sense-emu sense-hat sense-emu-tools python3-picamera ;do - if ! package_available $i ;then - error "User error: The $i package is not available on your system. :( Consider switching to Raspberry Pi OS." - fi -done - -version=1.2.1 -install_packages python3-pip https://github.com/alienzhangyw/BlockPi/releases/download/v${version}/blockpi_${version}_armv7l.deb || exit 1 diff --git a/apps/BlockPi/install-64 b/apps/BlockPi/install-64 deleted file mode 100755 index 0f31255bba..0000000000 --- a/apps/BlockPi/install-64 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -for i in python3-sense-emu sense-hat sense-emu-tools python3-picamera ;do - if ! package_available $i ;then - error "User error: The $i package is not available on your system. :( Consider switching to Raspberry Pi OS." - fi -done - -version=1.2.1 -install_packages python3-pip https://github.com/alienzhangyw/BlockPi/releases/download/v${version}/blockpi_${version}_arm64.deb || exit 1 - diff --git a/apps/BlockPi/uninstall b/apps/BlockPi/uninstall deleted file mode 100755 index 0bc39f365d..0000000000 --- a/apps/BlockPi/uninstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -purge_packages || exit 1 - diff --git a/apps/BlockPi/website b/apps/BlockPi/website deleted file mode 100644 index 00383ae777..0000000000 --- a/apps/BlockPi/website +++ /dev/null @@ -1 +0,0 @@ -https://github.com/alienzhangyw/BlockPi diff --git a/apps/Email Checker/description b/apps/Email Checker/description deleted file mode 100644 index 9bad426cc9..0000000000 --- a/apps/Email Checker/description +++ /dev/null @@ -1,4 +0,0 @@ -Continuously checks for new emails and display a notification if there are any. -When you click install, a window will appear for you to enter the email account's information and the time interval to check. -If you want to change the settings later, just click the Install button again. -Originally adapted from: https://learn.adafruit.com/raspberry-pi-e-mail-notifier-using-leds/python-script diff --git a/apps/Email Checker/icon-24.png b/apps/Email Checker/icon-24.png deleted file mode 100644 index ad3bae00254d27b659fa4c1c5c902174d5c0978c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmV;K0cQS*P)5NXlN z>h%nOZDBG=l2l5a^&7yu8)?z2V|5LHJ!ewUJjs|p0*E}|&5pF_)$UjZz=5U!b!(mj z=<06)S<$Q2?ic{Kg-LCE&%B^LCn4?vnyt10a1~R4R5{W3dhkWM2GpA^1K^%B8Rsg_ zR9;y9ZF??&TBB(IJfiym`R5l@>kR|og`NR2uk28-23u791yHHg4S?tW>`N|Jss`}W zzlG<|3*`}U&$)`+77mm>XIoe~%|FW(yngvtJSV;Z@Fwm2!|SWf00000NkvXXu0mjf D>guyE diff --git a/apps/Email Checker/icon-64.png b/apps/Email Checker/icon-64.png deleted file mode 100644 index 4b3209a6ab88c80a5f7e5af013f67b3d06581a6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 796 zcmV+%1LOROP)3Mc-MWm`^iH!!Q;+|0$cEPu(8;|*XKhG7_nVHk#C7+1%@Gmgh25fK2u{UiAF zlu5HNg))~UFO$emA_Ri_BQGDP=jWhudiMHw{Yb`_=k;U#A3wZL#{7~`01@GEILOoW zpY!SdKFbp(AUt0#m#zlJyE_0wsw7GdAW&j-1W=OVz2PERX9>XDuRp5&`ts(c)Bs*o zYhD4F1;o>|-|ykv1PP@fLFF}i7JmKF$;JL^M)UzQr_-scBW?>kKReL?1q2Okr7Q%3!fC6dd+i*p*#cDy zX!R_g(KKSH6_p!M)%^bMMyF0NNAm$ZLz<;brnD~M$d@F&%7Ix(`H0u-gI=mGFC2t; zmC)&OgXLY$HwDo&535+Zr8*Bntzn0QzI^ug`l1o@!Pm5}G!UVh`GAbRFbE*ILf|Hq zy$BL$U~hlTMwG693Eg3k-sz&K|3Rn~5d;@7j$_&Dvj)1~ z|EE4JH4tey<^!@Eev}pPB5BwUcY>ujr*Q!dR=EdV7_7=CI0L7|PqqK&`W*8CSq?wN#S8<0L5Pmzi@U?VMlSxHVFle=pnPag zRmEbD=ktQDEvL%|^u7zI=R6YI?M6kdu;gv)*z(TVd_YFk2Z&V4dsbd0zv=4BVZH7H znpa}#rjtkQL~Z^~r11eAr=D^{09z&4<6>Spq{e&=?4?DOgzA-e^Z&}qSr7C!!QiPFbu;m au86+^8N_&7tT=lB0000 ~/.config/autostart/checkmail.desktop -"${DIRECTORY}/etc/terminal-run" "echo -e 'If checkmail.py throws errors, you may have entered invalid information.\nUse this opportunity to test it out.\nFrom now on, checkmail.py will be run on every boot.' ; sudo python ${HOME}/raspi-email-checker/checkmail.py ; sleep infinity" 'Running Email Checker (checkmail.py)' & diff --git a/apps/Email Checker/uninstall b/apps/Email Checker/uninstall deleted file mode 100755 index 400bce0497..0000000000 --- a/apps/Email Checker/uninstall +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -if [ -d ~/raspi-email-checker ];then - gio trash ~/raspi-email-checker - echo -e "\\e[33mWARNING: Moved the raspi-email-checker folder to trash instead of deleting. -The checkmail.py script inside may contain a password!\\e[39m" -fi - -rm -f ~/.config/autostart/checkmail.desktop - -purge_packages || error "Dependencies failed to uninstall" diff --git a/apps/Email Checker/website b/apps/Email Checker/website deleted file mode 100644 index 8f8138b7f3..0000000000 --- a/apps/Email Checker/website +++ /dev/null @@ -1 +0,0 @@ -https://github.com/Botspot/raspi-email-checker diff --git a/apps/Pi-Apps Terminal Plugin (python)/credits b/apps/Pi-Apps Terminal Plugin (python)/credits deleted file mode 100644 index 173ad8f04f..0000000000 --- a/apps/Pi-Apps Terminal Plugin (python)/credits +++ /dev/null @@ -1 +0,0 @@ -App made by and added to pi-apps by RPICoder diff --git a/apps/Pi-Apps Terminal Plugin (python)/description b/apps/Pi-Apps Terminal Plugin (python)/description deleted file mode 100644 index a343a9cd21..0000000000 --- a/apps/Pi-Apps Terminal Plugin (python)/description +++ /dev/null @@ -1,17 +0,0 @@ -This is a terminal version of Pi-Apps but with more features. - -Usage -pi-apps [argument] - -Available Arguments: -"list-all" Prints the list of available apps that are installable -"list-installed" Prints all installed apps -"list-uninstalled" Prints all uninstalled apps -"install [appname]" Install any app available in pi-apps -"uninstall [appname]" Uninstall any app available in pi-apps -"search [appname]" Search for a app in pi-apps -"website [appname]" Prints website for app -"update" Update pi-apps -"gui" Launches gui for pi-apps - -Run "pi-apps help" to get this information \ No newline at end of file diff --git a/apps/Pi-Apps Terminal Plugin (python)/icon-24.png b/apps/Pi-Apps Terminal Plugin (python)/icon-24.png deleted file mode 100644 index 8eb4ec14583f22046f3ac61b0bad737120dd5a11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1099 zcmZvadrX^U7{yO7v|lfLT!a=Vv>?zD*232oSE)<^+fc5lT^St%EjM9oj9bBMUec9q zga8&9D6pByzzsGhI7~Ebi4rd%C^O46E{qYzW!#h{1V;oFKjR-}iBIxAC+Fn-{qg3! zP3Ei=Pks;|fM=@7V4*eOpF^AQ&Ah3FVblFiM{{r&xcfq{rw z1Q7*Uk6NvsnVH$$-5nep1UDQp3n1i>bwOOsWHNJeb5~YY!19Lt2IM!v@`C?SXm&vT z%3v_^^759Kmn9MjcuE8}L-sy+D)=9Pv>Vd*`uh5|wzkU3%IJpzEU^8+SA(wwF9s}< z!{OA`)opBSY;SM3x3~NF_<$b=#W#puMeGW~hrkIT2%^5eesgnkXJ^Olb|bhI+CSk} ztkGy%TU+Df<2yS$J32bz^$7^>X0ccW1qCjb%hS^{J3D)NdU|SVDmyy|k}eMqkC2cM zfq;*oGtlnfseBL$DDOi#1LZx)&VelgnBYjk;KKJHWZjURho}OgqmXuiG=W+NHxjD3 z;s+B>x*oz|$=Xl8x#;!y@xmKD>%DK$8KW>g#h@I$UwxG}yeiYdT3{dj1NNO_{PfX~ zgATcl)J!9Hk;N3oNH08m_3%4Aa@r@4a2Zo;dLcKX5Tq__nBek=)CMUm(#TBJ8n&Z0IZuy*@ax8G17_6ZN z2H0s)2eKRTPczF4%hy&VL1Vs|&u4~)4b*xRor^z|cx&-+#gWQK)O^*+6T|yQdawE~ zjIB%U0oFQBazpLJKsMMy;Z>DoSIe wbo#ixdTsn3>KQ#n-FZP&`UFr>S$z1_?_b~jJT%x>gT|x*(D3(T zg)4Bw->XVi-0F78lme8Kd^kS9*<$sNu@nV2iSrBR06A8GxB!?}NaE+frvxx50Ng8p zWx{VSg?Rv^i=jbWw!-lL49yuv6|lbt<4Vw6pdALY)3E*-%zP;8KsOmKa_H`Y(Gd`@ zK=**AAG89&6obrwRVS>kf~*M=6-snamP5q=Iy^f&JF!?iJUlFy%Ow&?VPPSZ^*~`l zCt50%g0{M(qyz?17!<+gdRbW+NEFyygH0dQ*TLysRaF(p8ZfPcX#>dGU`lFhYe6*y zBLWOAs20!)0$HoRzP_=sF*i3CloinMfhH?EI~(TBaCj^diJ)o&#|h{k5(~CDX|Oz z8neV_X(82;6?*q@PU(iDlHS8R)RqU*zfjfF(QVC|>XdD7mGP$r1~gqV_ar5p<7Gd( z=yxnP^GcTMke2CcX5uZCo@DwOZ6i)>gsar;)-Pk>HPxG?3m@kfkm(?Pw@`PsW6883 zFVMo!wrt?e*c;W9;kojJ`seZ6$}PrUb1OqOGUczEbSRC@p(l9lmJTLG%?Fvv0#IH)v{ZOm*P$vGeLNjdk*=ku{L&)>3wl-djGgl1p~> ztWRiGzgyX%&e$`=O2m?{^#Mq|jphJ@; z+FJ71nvdqb#rGM1LMYGZ+&9(BH9j`gi^6Rn#ocHT2cGY-|EUr4I zw?y1BNv}G=bmw)2aX#y?8Z>AYKbw6ZvB+xf~>r#vf&GwKtXi zk(K2zemApEnLq#Clyq;|zPEGQ7bdS+`n;=asI=MFoE5dL#>TOIQ0rvxfBTi*k~D z9o{F!YNjgcY$;+#iQ;2L3GQ*b6BGbv!r94zaB(1b34JZuZ0)cY+x5)=T/dev/null -sudo chmod +x /usr/local/bin/pi-apps diff --git a/apps/Pi-Apps Terminal Plugin (python)/uninstall b/apps/Pi-Apps Terminal Plugin (python)/uninstall deleted file mode 100755 index 822a824ced..0000000000 --- a/apps/Pi-Apps Terminal Plugin (python)/uninstall +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#Removing PiAppsTerminalAdvanced.py -rm "${DIRECTORY}/PiAppsTerminalAdvanced.py" -#Restoring old binary file -echo "#!/bin/bash -${DIRECTORY}/gui" | sudo tee /usr/local/bin/pi-apps >/dev/null - -sudo chmod +x /usr/local/bin/pi-apps diff --git a/apps/Pi-Apps Terminal Plugin (python)/website b/apps/Pi-Apps Terminal Plugin (python)/website deleted file mode 100644 index c0be217875..0000000000 --- a/apps/Pi-Apps Terminal Plugin (python)/website +++ /dev/null @@ -1 +0,0 @@ -https://github.com/techcoder20/PiAppsTerminalAdvanced diff --git a/apps/Sysmon/credits b/apps/Sysmon/credits deleted file mode 100644 index f7ab98186b..0000000000 --- a/apps/Sysmon/credits +++ /dev/null @@ -1,2 +0,0 @@ -@t0xic0der on GitHub for the creation of the app -@ryanfortner on GitHub for the scripts diff --git a/apps/Sysmon/description b/apps/Sysmon/description deleted file mode 100644 index 9f5cc76b03..0000000000 --- a/apps/Sysmon/description +++ /dev/null @@ -1,6 +0,0 @@ -Monitor your Raspberry Pi using a web browser on another computer. -This is a background service that hosts a website at :6969. Using any computer on your local network, you can go to that website and view many useful statistics. (And some useless ones too) - -For testing purposes, you can look at the website from the Pi itself by launching Chromium browser and going to http://localhost:6969 - -As mentioned earlier, the website is only visible to computers in the local network. diff --git a/apps/Sysmon/icon-24.png b/apps/Sysmon/icon-24.png deleted file mode 100644 index f18fe2ce4ef689066c831ac33d415407b24538d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 753 zcmW+!doWaC6#t~53{81P|HRfZ_(SEfvl4MVw(NRDDuo)Y4CS>N-4fO`c_;E}*jY)c zQA~pxkMRh*EgC&Vl$A%KVa&4k+TBj~`sO?5_xsN8oH;Y!Ik|y6Ujsc0J%o?}#}5mp za4&5;v?)LKY(z$ZR!Xq1r`Gs8`wWWj3G@%~rh@cIm`AB=D0UL@hf(4(O8$%D#+bPZ zW}(`zhD>;+N^9L=!~Mv3kpklY4GtJJJ= zRnte+0jf*fPv=rXCRa0y0Nn(OTyU#W8K-_{6sRkt8h#V#XTgJh!lhsyWdKUs^nV2A zIe>6Ax<%(B9JqBraf2-S>0S+o%eLZ_v~~H-R2BG&RFx9VLm8Z`)gb&IU5i7l$ec%g zNVp)FcM56yMstj@P^0!$0GOLF9RCflw%B9hwFofO0tB`UF#8>5%m*kPlpuAPp~)Zj zB^vm<-vadZbUQ#GtN@5d6Q^N6K?(BAsC0`gq*FI`6h8*m8 zNLuyf;@HSO2mQf(c1Y(6BjOEimLSyC6SAxqJQ`Lt?l~hq9oJ^LB@3`r$}9+aJUD1= zZ`-JdW)Fn;b7T1Yg?Y2af%>_!FRkl^BbMJLbnz^tstxr7jth8WqB zdYi}W@{rwqBQ)lMOaD%F38V~D>7qPHyF49l%O`|qS|X3s`^C(;V2zniWr_%A53Zh# zB+MoQYxi=yEwtHwr!H%sf-qqU*0b5Iq3>@TL#dMLOat;0pTM~0Y)8i))|H~n(}pdd zagI1FUUEEqXzVDuMlU<$d|J; z!oU(tH4z>vg|zcfB>`9BNkEi1`KctX26`937bCE|7uF5J>{fWI0|woL+G!ZNi}IeV zgh_SZQnPS!ES4&S4tZh_HUn6Ynk1$qNaSK>02^P1Bzczs7WPy0A}K}!!bC_at8yMO z%qqAwLrjhl0~W5pl@KFPJhaG#oLcCdKL^m3g)~dHXTpsrDN90%!Bmsr?(5K}5X!{i zAZk%FRU*%Y2APm?4F@O@3lA*88Q0J$CLJ{sSA(iXEs|Vn!BvxRz+CFya&$3re)Sn~ zP${&`g#mXK6?qaOTS7Yr*Cs=xYN@4YqJE-@9M(7dPJZXvsL};~)1sgi5?QJ{(HosT zO5ScByDbQz-6;9Ae{xw_E^ccnpS#Dr|vM(*I z)$47ra*11GFZmUbLnskek9YM{zHe&tts3w%G#^hLR*-4tzTIr~`ckObbrA8UQ$;T# zWSA<`ER2bmcGA3M%H&wFKhx4?g`{+QsRp6_5d(4I=|de-tNFK$t*JLPES_T4%6S>m z9;q4hO&d8Gw4-GPeSV{=W*-5MGMUj|d_q0Kd5Oil6+2%UhuNs zSHE7fM(g24{q=SMEpwCH2@219-gvxZr&>S#5&ljtT1J#ZqU`W$DpuO1%<0P7`-f!A zNJU{bhc^M@oi_A}+CB#t9n*?kL$~GRcW$do&)1oFK(Vk*3(VVNZIexJ$z#%vyYhl* zjV>-`U%#rU^XeTPJWU_O=$dorbvizz48AWe(2+5D;x`@iNIF-Pa7Qvooe45!b~rJr zo1_D?83o#H{~W;5$JIDzS2V}xY&qd|g6pWJHy{XDE?W&L7kl-IZ;TR#E?Ee*FX)eu z{6}^7W~-T#Io%DKIf}-FebZ9>XcI*%&PEO3crt4haXwak>J8!Vm*oNVDYw^mKPGky ztA17)9%EYVEu6ZmZ8Q(LiOPMWg_muxE|6y!lju1$F!Yq5;`AN?/dev/null - -#start the service -sudo systemctl daemon-reload || error "Failed to run systemctl daemon-reload!" -sudo systemctl enable WebStationSYSMON.service || error "Failed to enable sysmon service!" -sudo systemctl start WebStationSYSMON.service || error "Failed to start sysmon service!" diff --git a/apps/Sysmon/uninstall b/apps/Sysmon/uninstall deleted file mode 100755 index e25b2c5de8..0000000000 --- a/apps/Sysmon/uninstall +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -purge_packages || exit 1 -sudo systemctl stop WebStationSYSMON.service &>/dev/null -sudo systemctl disable WebStationSYSMON.service &>/dev/null -sudo systemctl daemon-reload || error "Failed to run systemctl daemon-reload!" -sudo rm -rf /opt/sysmon diff --git a/apps/Sysmon/website b/apps/Sysmon/website deleted file mode 100644 index 5b538d3516..0000000000 --- a/apps/Sysmon/website +++ /dev/null @@ -1 +0,0 @@ -https://github.com/t0xic0der/sysmon diff --git a/etc/categories b/etc/categories index e11069c58c..7b511e9c82 100644 --- a/etc/categories +++ b/etc/categories @@ -16,7 +16,6 @@ BalenaEtcher|Tools Better Chromium|Internet/Browsers BleachBit|System Management BlockBench|Creative Arts -BlockPi|Programming BlueJ Java IDE|Programming Bongo Cam|Multimedia Box64|Tools/Emulation @@ -55,7 +54,6 @@ Ducopanel|Tools Eagle CAD|Engineering eDEX-UI|Terminals Electron Fiddle|Programming -Email Checker|Internet/Communication Epiphany|Internet/Browsers ExaGear|Tools/Emulation Falkon|Internet/Browsers @@ -137,7 +135,6 @@ Pale Moon|Internet/Browsers PeaZip|Tools Persepolis Download Manager|Internet Pi-Apps Terminal Plugin (bash)|Tools -Pi-Apps Terminal Plugin (python)|Tools PiGro|Tools Pika Backup|System Management PiKISS GUI|Tools @@ -181,7 +178,6 @@ Stunt Rally|hidden Sublime Text|Programming Synaptic|System Management Syncthing|System Management -Sysmon|System Management SysMonTask|System Management System Monitoring Center|System Management Tabby|Terminals diff --git a/etc/category-overrides-jetson-18.04 b/etc/category-overrides-jetson-18.04 index c42892a1bb..5674c21d02 100644 --- a/etc/category-overrides-jetson-18.04 +++ b/etc/category-overrides-jetson-18.04 @@ -3,7 +3,6 @@ AntiMicroX|hidden Autostar|hidden Better Chromium|hidden BlockBench|hidden -BlockPi|hidden Box86|hidden Boxy SVG|hidden Chiaki|hidden diff --git a/etc/category-overrides-non-raspberry b/etc/category-overrides-non-raspberry index 1c995c4558..3f0a65d612 100644 --- a/etc/category-overrides-non-raspberry +++ b/etc/category-overrides-non-raspberry @@ -1,4 +1,3 @@ -BlockPi|hidden Chiaki|hidden CommanderPi|hidden Downgrade Chromium|hidden diff --git a/etc/runonce-entries b/etc/runonce-entries index b1bcc6478c..7bc98b2d45 100755 --- a/etc/runonce-entries +++ b/etc/runonce-entries @@ -62,6 +62,29 @@ runonce <<"EOF" refresh_all_pkgapp_status EOF +# remove deprecated apps (only when running in a visible terminal) +case $(ps -o stat= -p $$) in + *+*) # Running in foreground +runonce <<"EOF" + #remove deprecated apps + remove_deprecated_app "FreeCAD (precompiled)" + remove_deprecated_app "Chromium Media Edition" + remove_deprecated_app "Cordless" + remove_deprecated_app "Retropie" + remove_deprecated_app "Raspi2png" + remove_deprecated_app "Falkon" + remove_deprecated_app "FreeCAD" + remove_deprecated_app "LinuxCNC" + remove_deprecated_app "Steam" "32" + remove_deprecated_app "Cawbird" + remove_deprecated_app "Email Checker" + remove_deprecated_app "Pi-Apps Terminal Plugin (python)" + remove_deprecated_app "Sysmon" + remove_deprecated_app "BlockPi" +EOF + ;; +esac + #remove old apps and migrate chromium downgrading apps to the new "Downgrade Chromium" app runonce <<"EOF" #rework chromium downgrading apps to one single new app: 'Downgrade Chromium' @@ -71,18 +94,6 @@ runonce <<"EOF" echo "installed" > "${DIRECTORY}/data/status/Downgrade Chromium" fi - #remove deprecated apps - rm -rf "${DIRECTORY}/apps/FreeCAD (precompiled)" - rm -rf "${DIRECTORY}/apps/Chromium Media Edition" - rm -rf "${DIRECTORY}/apps/Cordless" - rm -rf "${DIRECTORY}/apps/Retropie" - rm -rf "${DIRECTORY}/apps/Raspi2png" - rm -rf "${DIRECTORY}/apps/Falkon" - rm -rf "${DIRECTORY}/apps/FreeCAD" - rm -rf "${DIRECTORY}/apps/LinuxCNC" - rm -f "${DIRECTORY}/apps/Steam/install-32" - rm -rf "${DIRECTORY}/apps/Cawbird" - #remove TBOPlayer if it's not already successfully installed if [ "$(app_status TBOPlayer)" != 'installed' ];then rm -rf "${DIRECTORY}/apps/TBOPlayer" From f6c17d69276b3e5f0e462a99f191fe9142863376 Mon Sep 17 00:00:00 2001 From: Botspot <54716352+Botspot@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:22:42 -0500 Subject: [PATCH 2/2] Remove TBOPlayer --- etc/runonce-entries | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/etc/runonce-entries b/etc/runonce-entries index 7bc98b2d45..3b2e99e390 100755 --- a/etc/runonce-entries +++ b/etc/runonce-entries @@ -81,6 +81,7 @@ runonce <<"EOF" remove_deprecated_app "Pi-Apps Terminal Plugin (python)" remove_deprecated_app "Sysmon" remove_deprecated_app "BlockPi" + remove_deprecated_app "TBOPlayer" EOF ;; esac @@ -94,11 +95,6 @@ runonce <<"EOF" echo "installed" > "${DIRECTORY}/data/status/Downgrade Chromium" fi - #remove TBOPlayer if it's not already successfully installed - if [ "$(app_status TBOPlayer)" != 'installed' ];then - rm -rf "${DIRECTORY}/apps/TBOPlayer" - fi - #rename 'Turbo Scratch' app to 'Turbowarp' rm -rf "${DIRECTORY}/apps/Turbo Scratch" mv -f "${DIRECTORY}/data/status/Turbo Scratch" "${DIRECTORY}/data/status/Turbowarp" 2>/dev/null