diff --git a/.conf/VERSIONID b/.conf/VERSIONID index 56fa9d45d0..fb52c5f642 100644 --- a/.conf/VERSIONID +++ b/.conf/VERSIONID @@ -1 +1 @@ -2.0.388 +2.0.389 diff --git a/archlinuxconfig.bash b/archlinuxconfig.bash index 89861c7807..188a6b151f 100644 --- a/archlinuxconfig.bash +++ b/archlinuxconfig.bash @@ -290,7 +290,7 @@ _CFLHDR_ usr/local/bin/csystemctl "# contributor https://github.com/petkar" cat >> usr/local/bin/csystemctl <<- EOM INSTALLDIR="$INSTALLDIR" printf "\\\\e[38;5;148m%s\\\\e[0m\\\\n" "Installing /usr/bin/systemctl replacement: " -[ -f /var/lock/\${INSTALLDIR##*/}/csystemctl.lock ] && printf "%s\\\\n" "Already installed /usr/local/bin/systemctl replacement: DONE 🏁" && exit +[ -f /var/lock/${INSTALLDIR##*/}/csystemctl.lock ] && printf "%s\\\\n" "Already installed /usr/local/bin/systemctl replacement: DONE 🏁" && exit declare COMMANDP COMMANDP="\$(command -v python3)" || printf "%s\\\\n" "Command python3 can not be found: continuing..." [[ "\${COMMANDP:-}" == *python3* ]] || pci python3 @@ -304,8 +304,8 @@ printf "%s\\\\n" "Getting replacement systemctl from https://raw.githubuserconte # download and copy to both directories /usr/local/bin and /usr/bin curl --fail --retry 2 https://raw.githubusercontent.com/TermuxArch/docker-systemctl-replacement/master/files/docker/systemctl3.py | tee /usr/bin/systemctl /usr/local/bin/systemctl >/dev/null chmod 700 /usr/bin/systemctl /usr/local/bin/systemctl -[ ! -e /var/lock/\${INSTALLDIR##*/}/ ] && mkdir -p /var/lock/\${INSTALLDIR##*/}/ -touch /var/lock/\${INSTALLDIR##*/}/csystemctl.lock +[ ! -e /var/lock/${INSTALLDIR##*/}/ ] && mkdir -p /var/lock/${INSTALLDIR##*/}/ +touch /var/lock/${INSTALLDIR##*/}/csystemctl.lock printf "\\\\e[38;5;148m%s\\\\e[1;32m%s\\\\e[0m\\\\n" "Installing systemctl replacement in /usr/local/bin and /usr/bin: " "DONE 🏁" # csystemctl EOF EOM @@ -594,38 +594,38 @@ fi done _PMUEOEP2_() { -if [ ! -f /var/run/lock/\${INSTALLDIR##*/}/kpmueoep2.lock ] +if [ ! -f /var/run/lock/${INSTALLDIR##*/}/kpmueoep2.lock ] then printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[1;37m...\\n\" \"Running \${0##*/} [\$3/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} --noconfirm\" -pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" --noconfirm && touch /var/run/lock/\${INSTALLDIR##*/}/kpmueoep2.lock +pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" --noconfirm && touch /var/run/lock/${INSTALLDIR##*/}/kpmueoep2.lock else printf \"\\n\\e[1;37m%s\\e[1;32m%s\\e[1;37m%s\\n\" \"[\$3/7] The command \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} --noconfirm\" \" has already been successfully run; Continuing...\" fi } _PMUEOEP3_() { -if [ ! -f /var/run/lock/\${INSTALLDIR##*/}/kpmueoep3.lock ] +if [ ! -f /var/run/lock/${INSTALLDIR##*/}/kpmueoep3.lock ] then printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[1;37m...\\n\" \"Running \${0##*/} [\$4/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} --noconfirm\" -pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" \"\${UPGDPKGS[\$3]##*/}\" --noconfirm && touch /var/run/lock/\${INSTALLDIR##*/}/kpmueoep3.lock +pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" \"\${UPGDPKGS[\$3]##*/}\" --noconfirm && touch /var/run/lock/${INSTALLDIR##*/}/kpmueoep3.lock else printf \"\\n\\e[1;37m%s\\e[1;32m%s\\e[1;37m%s\\e[0m\\n\" \"[\$4/7] The command \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} --noconfirm\" \" has already been successfully run; Continuing...\" fi } _PMUEOEP4_() { -if [ ! -f /var/run/lock/\${INSTALLDIR##*/}/kpmueoep4.lock ] +if [ ! -f /var/run/lock/${INSTALLDIR##*/}/kpmueoep4.lock ] then -printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[1;37m...\\n\" \"Running \${0##*/} [\$5/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} \${UPGDPKGS[\$4]##*/} --noconfirm\" ; pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" \"\${UPGDPKGS[\$3]##*/}\" \"\${UPGDPKGS[\$4]##*/}\" --noconfirm && touch /var/run/lock/\${INSTALLDIR##*/}/kpmueoep4.lock +printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[1;37m...\\n\" \"Running \${0##*/} [\$5/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} \${UPGDPKGS[\$4]##*/} --noconfirm\" ; pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" \"\${UPGDPKGS[\$3]##*/}\" \"\${UPGDPKGS[\$4]##*/}\" --noconfirm && touch /var/run/lock/${INSTALLDIR##*/}/kpmueoep4.lock else printf \"\\n\\e[1;37m%s\\e[1;32m%s\\e[1;37m%s\\e[0m\\n\" \"[\$5/7] The command \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} \${UPGDPKGS[\$4]##*/} --noconfirm\" \" has already been successfully run; Continuing...\" fi } _PMUEOEP5_() { -if [ ! -f /var/run/lock/\${INSTALLDIR##*/}/kpmueoep5.lock ] +if [ ! -f /var/run/lock/${INSTALLDIR##*/}/kpmueoep5.lock ] then -printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[0m...\\n\" \"Running \${0##*/} [\$6/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} \${UPGDPKGS[\$4]##*/} \${UPGDPKGS[\$5]##*/} --noconfirm\" ; pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" \"\${UPGDPKGS[\$3]##*/}\" \"\${UPGDPKGS[\$4]##*/}\" \"\${UPGDPKGS[\$5]##*/}\" --noconfirm && touch /var/run/lock/\${INSTALLDIR##*/}/kpmueoep5.lock +printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[0m...\\n\" \"Running \${0##*/} [\$6/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} \${UPGDPKGS[\$4]##*/} \${UPGDPKGS[\$5]##*/} --noconfirm\" ; pacman -U \"\${UPGDPKGS[\$1]##*/}\" \"\${UPGDPKGS[\$2]##*/}\" \"\${UPGDPKGS[\$3]##*/}\" \"\${UPGDPKGS[\$4]##*/}\" \"\${UPGDPKGS[\$5]##*/}\" --noconfirm && touch /var/run/lock/${INSTALLDIR##*/}/kpmueoep5.lock else printf \"\\n\\e[1;37m%s\\e[1;32m%s\\e[1;37m%s\\e[0m\\n\" \"[\$6/7] The command \" \"pacman -U \${UPGDPKGS[\$1]##*/} \${UPGDPKGS[\$2]##*/} \${UPGDPKGS[\$3]##*/} \${UPGDPKGS[\$4]##*/} \${UPGDPKGS[\$5]##*/} --noconfirm\" \" has already been successfully run; Continuing...\" fi @@ -642,11 +642,11 @@ mv -f /tmp/{libcrypto.so.1.0.0,libssl.so.1.0.0} /usr/lib/ sed -i '/^Architecture/s/.*/Architecture = i686/' /etc/pacman.conf sed -i '/^SigLevel/s/.*/SigLevel = Never/' /etc/pacman.conf sed -i 's/^HoldPkg/\#HoldPkg/g' /etc/pacman.conf -if [ ! -f /var/run/lock/\${INSTALLDIR##*/}/kkeyring.lock ] +if [ ! -f /var/run/lock/${INSTALLDIR##*/}/kkeyring.lock ] then printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[1;37m...\\n\" \"Running \${0##*/} [5/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -S archlinux-keyring archlinux32-keyring --noconfirm\" _KEYSGENMSG_ -pacman -S archlinux-keyring archlinux32-keyring --noconfirm && touch /var/run/lock/\${INSTALLDIR##*/}/kkeyring.lock || _PRTERROR_ +pacman -S archlinux-keyring archlinux32-keyring --noconfirm && touch /var/run/lock/${INSTALLDIR##*/}/kkeyring.lock || _PRTERROR_ else printf \"\\n\\e[1;37m%s\\e[1;32m%s\\e[1;37m%s\\e[0m\\n\" \"[5/7] The command \" \"pacman -S archlinux-keyring archlinux32-keyring --noconfirm\" \" has already been successfully run; Continuing...\" fi @@ -655,7 +655,7 @@ printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[1;37m...\\n\" \"Running \${0# pacman -S pacman --noconfirm || _PRTERROR_ printf \"\\n\\e[1;32m==> \\e[1;37m%s\\e[1;32m%s\\e[1;37m...\\n\" \"Running \${0##*/} [7/7] $ARCHITEC ($CPUABI) architecture upgrade ; \" \"pacman -Su --noconfirm ; Starting full system upgrade\" rm -f /etc/ssl/certs/ca-certificates.crt -pacman -Su --noconfirm" +pacman -Su --noconfirm || pacman -Su --noconfirm" X86IPT=" " X86INK=":" else # architecture versions armv5, armv7, aarch64 and x86_64 of Arch Linux use these options @@ -729,12 +729,12 @@ printf "\\\\n\\\\e[1;32m==> \\\\e[1;37mRunning \\\\e[1;32mpacman -Sy\\\\e[1;37m. $ECHOEXEC $ECHOSYNC pacman -Sy } _DOPSY_ || _DOPSY_ || _PRTERROR_ -[ ! -d /var/run/lock/\${INSTALLDIR##*/} ] && mkdir -p /var/run/lock/\${INSTALLDIR##*/} +[ ! -d /var/run/lock/${INSTALLDIR##*/} ] && mkdir -p /var/run/lock/${INSTALLDIR##*/} _DOKPI_() { -if [ ! -f /var/run/lock/\${INSTALLDIR##*/}/kpi.lock ] +if [ ! -f /var/run/lock/${INSTALLDIR##*/}/kpi.lock ] then printf "\\\\e[1;32m==> \\\\e[1;37mRunning \\\\e[1;32mpacman-key --init\\\\e[1;37m...\\\\n" -$ECHOEXEC pacman-key --init && touch /var/run/lock/\${INSTALLDIR##*/}/kpi.lock || _PRTERROR_ +$ECHOEXEC pacman-key --init && touch /var/run/lock/${INSTALLDIR##*/}/kpi.lock || _PRTERROR_ else printf "\\\\e[1;32m==> \\\\e[1;37mAlready initialized with command \\\\e[1;32mpacman-key --init\\\\e[1;37m...\\\\n" fi @@ -744,10 +744,10 @@ chmod 4777 /usr/bin/newgidmap chmod 666 /usr/lib/tmpfiles.d/journal-nocow.conf chmod 700 /etc/pacman.d/gnupg _DOPP_() { -if [ ! -f /var/run/lock/\${INSTALLDIR##*/}/kpp.lock ] +if [ ! -f /var/run/lock/${INSTALLDIR##*/}/kpp.lock ] then printf "\\\\e[1;32m==> \\\\e[1;37mRunning \\\\e[1;32mpacman-key --populate\\\\e[1;37m...\\\\n" -$ECHOEXEC pacman-key --populate && touch /var/run/lock/\${INSTALLDIR##*/}/kpp.lock || _PRTERROR_ +$ECHOEXEC pacman-key --populate && touch /var/run/lock/${INSTALLDIR##*/}/kpp.lock || _PRTERROR_ else printf "\\\\e[1;32m==> \\\\e[1;37mAlready populated with command \\\\e[1;32mpacman-key --populate\\\\e[1;37m...\\\\n" fi @@ -774,7 +774,7 @@ if [ "\$UID" = "0" ] then printf "\\\\e[1;31m%s\\\\e[1;37m%s\\\\e[1;31m%s\\\\e[0m\\\\n" "ERROR:" " Script '\${0##*/}' should not be used as root: The command 'addauser' creates user accounts in Arch Linux in Termux PRoot and configures these user accounts for the command 'sudo': The 'addauser' command is intended to be run by the Arch Linux in Termux PRoot root user: To use 'addauser' directly from Termux you can run \"$STARTBIN command 'addauser user'\" in Termux to create this account in Arch Linux Termux PRoot: The command '$STARTBIN help' has more information about using '$STARTBIN': " "Exiting..." else -[ ! -f /var/lock/\${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[0;33m%s\\\\e[0m\\\\n" "Lock file /var/lock/\${INSTALLDIR##*/}/patchmakepkg.lock found; Continuing..." +[ ! -f /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[0;33m%s\\\\e[0m\\\\n" "Lock file /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock found; Continuing..." printf "%s\\\\n" "Preparing to build and install fakeroot-tcp with \${0##*/} $VERSIONID: " if ([[ ! "\$(command -v automake)" ]] || [[ ! "\$(command -v git)" ]] || [[ ! "\$(command -v gcc -v)" ]] || [[ ! "\$(command -v libtool)" ]] || [[ ! "\$(command -v po4a)" ]]) 2>/dev/null then @@ -790,18 +790,18 @@ sed -i 's/pkgver=1.24/pkgver=1.25.3/g' PKGBUILD sed -i 's/ftp.debian.org\/debian/http.kali.org\/kali/g' PKGBUILD sed -i '/^md5sums=/{n;d}' PKGBUILD sed -ir "s/^md5sums=.*/md5sums=('f6104ef6960c962377ef062bf222a1d2')/g" PKGBUILD -touch /var/lock/\${INSTALLDIR##*/}/makefakeroottcp_FUNDOPKGBUILD_.lock +touch /var/lock/${INSTALLDIR##*/}/makefakeroottcp_FUNDOPKGBUILD_.lock } cd fakeroot-tcp -[ ! -f /var/lock/\${INSTALLDIR##*/}/makefakeroottcp_FUNDOPKGBUILD_.lock ] && _FUNDOPKGBUILD_ +[ ! -f /var/lock/${INSTALLDIR##*/}/makefakeroottcp_FUNDOPKGBUILD_.lock ] && _FUNDOPKGBUILD_ printf "%s\\\\n" "Running command 'makepkg -irs'; Building and attempting to install 'fakeroot-tcp' with '\${0##*/}' $VERSIONID. Please be patient..." makepkg -irs || _PRTERROR_ libtool --finish /usr/lib/libfakeroot || _PRTERROR_ -touch /var/lock/\${INSTALLDIR##*/}/makefakeroottcp.lock +touch /var/lock/${INSTALLDIR##*/}/makefakeroottcp.lock fi printf "%s\\\\n" "Building and installing fakeroot-tcp: DONE 🏁" } -[ ! -f /var/lock/\${INSTALLDIR##*/}/makefakeroottcp.lock ] && _DOMAKEFAKEROOTTCP_ || printf "%s\\\\n" "Please remove file /var/lock/\${INSTALLDIR##*/}/makefakeroottcp.lock in order to rebuild fakeroot-tcp with \${0##*/} $VERSIONID." +[ ! -f /var/lock/${INSTALLDIR##*/}/makefakeroottcp.lock ] && _DOMAKEFAKEROOTTCP_ || printf "%s\\\\n" "Please remove file /var/lock/${INSTALLDIR##*/}/makefakeroottcp.lock in order to rebuild fakeroot-tcp with \${0##*/} $VERSIONID." # makefakeroottcp EOF EOM chmod 700 usr/local/bin/makefakeroottcp @@ -836,14 +836,14 @@ The message above will be displayed for a short time with more information. The Then this process will continue to try to make 'yay' which is much simpler for the user; There is no tapping yes enter needed to be done whatsoever. Script \${0##*/} information presentation done; SLEEPING SIX SECONDS..." sleep 6 -[ ! -f /var/lock/\${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[0;33m%s\\\\e[0m\\\\n" "Lock file /var/lock/\${INSTALLDIR##*/}/patchmakepkg.lock found; Continuing..." +[ ! -f /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock ] && patchmakepkg || printf "\\\\e[0;33m%s\\\\e[0m\\\\n" "Lock file /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock found; Continuing..." if ([[ ! "\$(command -v automake)" ]] || [[ ! "\$(command -v git)" ]] || [[ ! "\$(command -v gcc)" ]] || [[ ! "\$(command -v go)" ]] || [[ ! "\$(command -v po4a)" ]]) 2>/dev/null then pci automake base base-devel git gcc glibc go libtool po4a || printf "\\n\\e[1;31mERROR: \\e[7;37m%s\\e[0m\\n\\n" "Please correct the error(s) and/or warning(s) by running command 'pci automake base base-devel git gcc glibc go libtool po4a' as root user. You can do this without closing this session by running command \"$STARTBIN command 'pci automake base base-devel git gcc glibc go libtool po4a'\"in a new Termux session. Then you can return to this session and run '\${0##*/} \${ARGS[@]}' again." fi cd [ ! -d fakeroot-tcp ] && gcl https://aur.archlinux.org/fakeroot-tcp.git -[ ! -f /var/lock/\${INSTALLDIR##*/}/makefakeroottcp.lock ] && makefakeroottcp || printf "%s\\\\n" "Please remove file /var/lock/\${INSTALLDIR##*/}/makefakeroottcp.lock in order to rebuild fakeroot-tcp with \${0##*/} $VERSIONID." +[ ! -f /var/lock/${INSTALLDIR##*/}/makefakeroottcp.lock ] && makefakeroottcp || printf "%s\\\\n" "Please remove file /var/lock/${INSTALLDIR##*/}/makefakeroottcp.lock in order to rebuild fakeroot-tcp with \${0##*/} $VERSIONID." ! fakeroot ls 2>&1 >/dev/null && makefakeroottcp [ ! -d yay ] && gcl https://aur.archlinux.org/yay.git cd yay && _PRMAKE_ && makepkg -irs --noconfirm || printf "\\\\e[1;31m%s\\\\e[1;37m%s\\\\n" "ERROR: " "The command 'makepkg -irs --noconfirm' did not run as expected; CONTINUING..." @@ -857,9 +857,9 @@ chmod 700 usr/local/bin/makeyay _ADDorcaconf_() { _CFLHDR_ usr/local/bin/orcaconf "# orcaconf contributor https://github.com/JanuszChmiel" "# Reference https://github.com/SDRausty/termux-archlinux/issues/66 Let us expand setupTermuxArch so users can install Orca screen reader (assistive technology) and also have VNC support added easily." cat >> usr/local/bin/orcaconf <<- EOM -[[ -f /var/lock/\${INSTALLDIR##*/}/orcaconf.lock ]] && printf "%s\\\\n" "Already configured orca: DONE 🏁" && exit +[[ -f /var/lock/${INSTALLDIR##*/}/orcaconf.lock ]] && printf "%s\\\\n" "Already configured orca: DONE 🏁" && exit _INSTALLORCACONF_() { -[[ ! -f /var/lock/\${INSTALLDIR##*/}/orcaconfinstall.lock ]] && (nice -n 18 pci espeak-ng mate mate-extra orca pulseaudio-alsa tigervnc || nice -n 18 pci espeak-ng mate mate-extra orca pulseaudio-alsa tigervnc) && mkdir -p /var/lock/\${INSTALLDIR##*/}/ && touch /var/lock/\${INSTALLDIR##*/}/orcaconfinstall.lock || printf "%s\\n" "_INSTALLORCACONF_ \${0##*/} did not completed as expected; Continuing..." +[[ ! -f /var/lock/${INSTALLDIR##*/}/orcaconfinstall.lock ]] && (nice -n 18 pci espeak-ng mate mate-extra orca pulseaudio-alsa tigervnc || nice -n 18 pci espeak-ng mate mate-extra orca pulseaudio-alsa tigervnc) && mkdir -p /var/lock/${INSTALLDIR##*/}/ && touch /var/lock/${INSTALLDIR##*/}/orcaconfinstall.lock || printf "%s\\n" "_INSTALLORCACONF_ \${0##*/} did not completed as expected; Continuing..." } _INSTALLORCACONF_ || _INSTALLORCACONF_ || (printf "%s\\n" "_INSTALLORCACONF_ \${0##*/} did not completed as expected. Please check for errors and run \${0##*/} again." && exit) printf "%s\\n" "export DISPLAY=:0 @@ -867,7 +867,7 @@ export PULSE_SERVER=127.0.0.1 unset DBUS_SESSION_BUS_ADDRESS unset SESSION_MANAGER" >> \$HOME/.profile csystemctl || printf "\\e[1;31m%s\\e[0m\\n" "command 'csystemctl' did not completed as expected" -[[ ! -f /var/lock/\${INSTALLDIR##*/}/orcaconf.lock ]] && touch /var/lock/\${INSTALLDIR##*/}/orcaconf.lock +[[ ! -f /var/lock/${INSTALLDIR##*/}/orcaconf.lock ]] && touch /var/lock/${INSTALLDIR##*/}/orcaconf.lock orcarun || printf "\\e[1;31m%s\\e[0m\\n" "command 'orcarun' did not completed as expected" # orcaconf EOF EOM @@ -891,7 +891,7 @@ _ADDorcarun_ _ADDpatchmakepkg_() { _CFLHDR_ usr/local/bin/patchmakepkg "# patch makepkg" cat >> usr/local/bin/patchmakepkg <<- EOM -[ -f /var/lock/\${INSTALLDIR##*/}/patchmakepkg.lock ] && printf "%s\\\\n" "Already patched makepkg: DONE 🏁" && exit +[ -f /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock ] && printf "%s\\\\n" "Already patched makepkg: DONE 🏁" && exit printf "%s\\\\n" "Attempting to patch makepkg: " SDATE="\$(date +%s)" BKPDIR="$INSTALLDIR/var/backups/${INSTALLDIR##*/}/" @@ -921,7 +921,7 @@ fi # copy makepkg to /usr/local/bin to update proof it (fail safe measure) cp /bin/makepkg /usr/local/bin/makepkg # create lock file to update proof patchmakepkg -mkdir -p /var/lock/\${INSTALLDIR##*/}/ ; touch /var/lock/\${INSTALLDIR##*/}/patchmakepkg.lock +mkdir -p /var/lock/${INSTALLDIR##*/}/ ; touch /var/lock/${INSTALLDIR##*/}/patchmakepkg.lock printf "%s\\\\n" "Attempting to patch makepkg: DONE 🏁" # patchmakepkg EOF EOM diff --git a/printoutstatements.bash b/printoutstatements.bash index 6646a6f4d3..3d420c8b4d 100644 --- a/printoutstatements.bash +++ b/printoutstatements.bash @@ -15,7 +15,7 @@ FLHDR1[1]="# IFS=$'\\n\\t'" FLHDR1[2]="set -Eeuo pipefail" FLHDR1[3]="shopt -s nullglob globstar" FLHDR1[4]="unset LD_PRELOAD" -FLHDR1[5]="VERSIONID=2.0.387" +FLHDR1[5]="VERSIONID=2.0.388" FLHDR1[6]="" FLHDRP[0]="## BEGIN #####################################################################" FLHDRP[1]="" diff --git a/setupTermuxArch b/setupTermuxArch index a7679f039d..35b97b8208 100755 --- a/setupTermuxArch +++ b/setupTermuxArch @@ -5,7 +5,7 @@ # command 'setupTermuxArch h[elp]' has information how to use this file ################################################################################ IFS=$'\n\t' -VERSIONID=2.0.387 +VERSIONID=2.0.388 set -Eeuo pipefail shopt -s nullglob globstar umask 0022 diff --git a/setupTermuxArch.bash b/setupTermuxArch.bash index a7679f039d..35b97b8208 100755 --- a/setupTermuxArch.bash +++ b/setupTermuxArch.bash @@ -5,7 +5,7 @@ # command 'setupTermuxArch h[elp]' has information how to use this file ################################################################################ IFS=$'\n\t' -VERSIONID=2.0.387 +VERSIONID=2.0.388 set -Eeuo pipefail shopt -s nullglob globstar umask 0022 diff --git a/setupTermuxArch.sh b/setupTermuxArch.sh index a7679f039d..35b97b8208 100755 --- a/setupTermuxArch.sh +++ b/setupTermuxArch.sh @@ -5,7 +5,7 @@ # command 'setupTermuxArch h[elp]' has information how to use this file ################################################################################ IFS=$'\n\t' -VERSIONID=2.0.387 +VERSIONID=2.0.388 set -Eeuo pipefail shopt -s nullglob globstar umask 0022 diff --git a/setupTermuxArch.sha512 b/setupTermuxArch.sha512 index 4aa6ea236c..db17d9be02 100644 --- a/setupTermuxArch.sha512 +++ b/setupTermuxArch.sha512 @@ -1 +1 @@ -7c0cae1328b8bff2e18be682d6996d5d09ab74fdc89e7e0453ff695a67f33952f1ea7b7de29b376667a52c0ab3b7a7176d4980422a2133bf4c32cfb0487839a6 setupTermuxArch.tar.gz +31187ce310f2872d62b43030de8a8d29a7b7e8f3a9df102585b1d5b7cad2d84bd532843eda998e77948a887195e1753de119310e0f67172617c508de2e6ce73c setupTermuxArch.tar.gz diff --git a/setupTermuxArch.tar.gz b/setupTermuxArch.tar.gz index f6b8497813..8c4967c97f 100644 Binary files a/setupTermuxArch.tar.gz and b/setupTermuxArch.tar.gz differ diff --git a/sha512.sum b/sha512.sum index 773c7636f8..7db7d75339 100644 --- a/sha512.sum +++ b/sha512.sum @@ -4,9 +4,9 @@ cdbdd9c25333a8124f87902e33743114dae34565019012aa817a24aa324ad17dfd4a480629194d3c 5c5fcc5e8edf82afdd683a2467241296f53f9d3b9214f47b74b39e6e086af82af7d58f1133ae8cde5aeeef10c7be506e870e35d86d21729d36ff1c226ce4994a ./maintenanceroutines.bash 20ade307e6d2f9ecfe688f67774f7d3eff6ddea509dfa7f30bd39787f31c8738de93e092f9b03beae8399d3bad1b07087d3f5c9b2955ab3d08a31d0fd3a1ce09 ./README.md 8fa003af5524d81bfcd74663833f64bc00791a1ca7894f74bfaba8012736ed60beaf89ca932fd69a0fa3104e9a48944bc1a0b14634a41848688af6d409859024 ./CHANGE.log -7c0cae1328b8bff2e18be682d6996d5d09ab74fdc89e7e0453ff695a67f33952f1ea7b7de29b376667a52c0ab3b7a7176d4980422a2133bf4c32cfb0487839a6 ./setupTermuxArch.tar.gz +31187ce310f2872d62b43030de8a8d29a7b7e8f3a9df102585b1d5b7cad2d84bd532843eda998e77948a887195e1753de119310e0f67172617c508de2e6ce73c ./setupTermuxArch.tar.gz a168fe76a5e82133887351e1410042e628d4f79c753f58d449a6205659259267d287847f73c9366515b3132aaaa9aec69cf55349486a0de989f7dc02015062ec ./knownconfigurations.bash -b5dcbcb155ed942c2ef9c6052b33b1c3c008a901a8fd58361f43352e190673f398f1772432f859f49eeaacca24b286742d1cc8229c2b0d39fd1eea2f6cac9561 ./archlinuxconfig.bash +a9df6a8a98c092f11c05730a9d9b11e211b41ef0dc00c42ae657fe1dcc45d99e28b2e50678854bc0ec82ea728395f8a1ffe2e432688f3a2de7109d35bed078d9 ./archlinuxconfig.bash 05a502a845e35bc0495a3a3006ae914785c48679dddd362bd98bd33c306ed2aa8fac57344b1b65955d41755c3967f3e991770764f6c2f14c6a52f3e52e00ef1c ./.github/FUNDING.yml 5e20f4451f28b2ad8cd03e174bafa7c5d2d08cb3d9c6364a1f36b47fa1a2ae7e222970337f1481f149b6f87894f59e113bc49924776d558f0eb0773f6eebcd56 ./.github/workflows/label.yml ec770c00aa2c6225a2e27e8f08bd3d1eb8882f2cde94c820ab48db0b0fb0175913cd43a851904ff015c95f1fa31bb787383608cf19eb9d34f572b5fa8f9250ab ./.github/workflows/greetings.yml @@ -14,17 +14,17 @@ ec770c00aa2c6225a2e27e8f08bd3d1eb8882f2cde94c820ab48db0b0fb0175913cd43a851904ff0 fdcfcc010ded1ca05a1ac51878f6fce049a7c3d3ca9b45d19a57ff8cac47a77eafbb50307e0fe22bf51364878d7f222d38dd2fa5a8eca5c33cdc6ed3830070f6 ./pullTermuxArchSubmodules.bash be4cf1b862e9843e359c08d8fbe90eff27e193a4f864b1937b3cad1fffecdf2374541eb21359fbe6b346e4bd1db4e223861878389f8e887f78ba06f53feb8eb7 ./.gitpod.yml 1fbd5bbe1d7a8fad9bcbfe3410fab3ebbd1e79bc728b301eeb78b956357d3d0cd5829e500879e5621eb531147f2c2fc0e4f76f313dd515892bec6010bd3a2a00 ./LICENSE -952eb4c6440b96650592569e64fa965cccbaa0988f0be16976663c8725e3329ffa33d00828b8e9a2657359df3529f4a85edba7b88f5a1c38e953c50a7281978c ./setupTermuxArch +6b07ed1c4aa038e9fe2a08990e971e589e43b4a209952d85c09e531e77014c90b8035f082a47144df93ced7450fb528f7054ef3a296a3464d8d474cad64e4d67 ./setupTermuxArch 9ae12dac3a7ad11cc929036d608e0113595925c48f6f9bf65af299bf01e1b0dbf9eedaa118c53bf957ae909c52e322bf7431b95ca0cc8517924321c678346dcb ./sitemap.txt 90559e5df2d5893d892680f9618863cd946d1677098b5c69edba59d8475b3d38f2e558e799bb4c85d354ef6abe232e31d90ca307a039d17db4bf402dc1f9786e ./.gitmodules -3fc34c4384a62898b2daabdf297d40bcdd230d87621972d2274a9763463ac16ef90b92d73922bafd70fb96fd77b5427890123f3bcbd400ce2f413ec2960afecf ./printoutstatements.bash +e777b9a75e67e98c6d11bd63d738e59b8b94e80a9c1936b1a0b6528125bb5515d5980243040fe997dbe3a328a332712a95c156c55b446930e3e98ff2f2bcc716 ./printoutstatements.bash b6178b0fdb2f619b4be5034fbab5c42eba5f7ab699f7e6870e8203a7e22d0e0db7104675dc1f8f45cd8b2925eaddcfa14e217196e48537b6cf46d4448807deef ./setupTermuxArchConfigs.bash e3e04c865fd494f4c6e2492d30ae34008073fdb652ebdd7f9d47cd34c065b8abbefea94247810522babbe83a617f08a1e3c43c0682dcfb1185752cd22130eab8 ./CONTRIBUTORS.md ccf293248249a718ec3e2dd92af558241a9510bbf575ed6af48158acc302cefd7b5cc41d30ac6e525c35de5afd396691a33a35890918d9b537046b1dcf8d7df0 ./404.md -ee8d845042ce7f42fc65a0b876e478837eb0836a643b329d773cbfb58ef023382f8b707c1675ff998efb9b6e1cf94f2795f1d6db1ba872a429076957acd7c691 ./.conf/VERSIONID +03c2068df3319a61a2aa9998030e95ec5ba8437a7e4a57d3c29aa3c685c95a5d0e472eebceeb68bb14f9d5c83498d380e870288b44318755be6c4674af33c065 ./.conf/VERSIONID 494c1a4bbb505fb3009f0e434530b6401adf6fb502fd0f01eb31b757e6dd397fd2e78dc603ef03de0f86faaa25fcb763f1b5b8c2aa397ff8f5cbda6728351722 ./NOTICE.md 6f8a50ec0f811b35515666ecf5131bc59391a32a4760dd9994c64b2209544532dac4160c61dc0a53622b6453d34e6061b810e7a64bdcc853cf795e10d21ba3b8 ./robots.txt -952eb4c6440b96650592569e64fa965cccbaa0988f0be16976663c8725e3329ffa33d00828b8e9a2657359df3529f4a85edba7b88f5a1c38e953c50a7281978c ./setupTermuxArch.sh -952eb4c6440b96650592569e64fa965cccbaa0988f0be16976663c8725e3329ffa33d00828b8e9a2657359df3529f4a85edba7b88f5a1c38e953c50a7281978c ./setupTermuxArch.bash +6b07ed1c4aa038e9fe2a08990e971e589e43b4a209952d85c09e531e77014c90b8035f082a47144df93ced7450fb528f7054ef3a296a3464d8d474cad64e4d67 ./setupTermuxArch.sh +6b07ed1c4aa038e9fe2a08990e971e589e43b4a209952d85c09e531e77014c90b8035f082a47144df93ced7450fb528f7054ef3a296a3464d8d474cad64e4d67 ./setupTermuxArch.bash b9303b1c4ccd5cb151e65c243005e9bcf59182b02fb413d47a255672a85dc08adf323e754d1615f9ce5962e97b7824d2a78047cd56972c9109f3e7e5d1ab7a17 ./.gitpod.Dockerfile -96ac6902344d5226daa3bdee03fd6c1fa92a4038fe2f922a95d7f2f987c1587372d433ac251add5529f3d14c9436aa5db094f4d1b450a221690d7a628a3dc860 ./setupTermuxArch.sha512 +e3e1a2f9a2df0a5dc5e206a77d75b84bd0a3e09ffa1b84ee9db3bc368f0914fafc2810b3b43bc885a0bfe1b166b0e04f1633d8823801c92867cd826fec20896b ./setupTermuxArch.sha512