Overview
| Comment: | Fixes and refinements to the POSIX installation (Bash) scripts. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
5845d07f1fc82befe6e2218cadb3a171 |
| User & Date: | mistachkin on 2019-08-18 01:16:24 |
| Other Links: | manifest | tags |
Context
|
2019-08-18
| ||
| 01:49 | Stop disabling certificate checks for wget and/or curl in the POSIX installation (Bash) scripts. check-in: 5ec7a8a7f0 user: mistachkin tags: trunk | |
| 01:16 | Fixes and refinements to the POSIX installation (Bash) scripts. check-in: 5845d07f1f user: mistachkin tags: trunk | |
|
2019-08-15
| ||
| 06:24 | Revise how the repository script blocks are created by the uploader so it places the file name list first. check-in: 904bc7af64 user: mistachkin tags: trunk | |
Changes
Modified tools/pkgr_an_d_get.sh from [c3d91f2ca4] to [bd2bbbb7f8].
1 2 3 4 5 6 7 8 | #!/bin/bash if [ ! -x "$(command -v tclsh)" ]; then echo "The program 'tclsh' is apparently not installed." echo "Please use 'apt-get install tcl8.6' (Linux)." exit 1 fi | | < < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
#!/bin/bash
if [ ! -x "$(command -v tclsh)" ]; then
echo "The program 'tclsh' is apparently not installed."
echo "Please use 'apt-get install tcl8.6' (Linux)."
exit 1
fi
if ! echo "exit [catch {package require tls}]" | tclsh; then
echo "The 'tls' package for Tcl is not installed."
echo "Please use 'apt-get install tcl-tls' (Linux)."
exit 1
fi
if [ ! -x "$(command -v wget)" ] && [ ! -x "$(command -v curl)" ]; then
echo "The programs 'wget' and/or 'curl' are apparently not installed."
echo "Please use 'apt-get install wget' (Linux) or 'brew install wget' (Mac)."
|
| ︙ | ︙ | |||
57 58 59 60 61 62 63 | PKGR_CLIENT_URI=https://urn.to/r/pkg_client_full PKGR_TMP_FILE=pkgrd_tmp_file.zip PKGR_GET_OK=0 if [ -x "$(command -v wget)" ]; then for wgetArg in "" "--no-check-certificate" do | | | | | > | | | | > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 |
PKGR_CLIENT_URI=https://urn.to/r/pkg_client_full
PKGR_TMP_FILE=pkgrd_tmp_file.zip
PKGR_GET_OK=0
if [ -x "$(command -v wget)" ]; then
for wgetArg in "" "--no-check-certificate"
do
if wget -4 $wgetArg "--output-document=${PKGR_TMP_FILE}" "${PKGR_CLIENT_URI}"; then
if [ -f "${PKGR_TMP_FILE}" ]; then
PKGR_GET_OK=1
break
fi
fi
done
else
for curlArg in "" "--insecure"
do
if curl -4 $curlArg --location "${PKGR_CLIENT_URI}" > "${PKGR_TMP_FILE}"; then
if [ -f "${PKGR_TMP_FILE}" ]; then
PKGR_GET_OK=1
break
fi
fi
done
fi
if [ $PKGR_GET_OK -eq 0 ] || [ ! -f "${PKGR_TMP_FILE}" ]; then
echo "Could not download the package client toolset archive."
exit 1
|
| ︙ | ︙ |
Modified tools/pkgr_an_d_install.sh from [52453fa5b0] to [a7d805fc2b].
1 2 3 4 5 6 7 8 | #!/bin/bash if [ ! -x "$(command -v tclsh)" ]; then echo "The program 'tclsh' is apparently not installed." echo "Please use 'apt-get install tcl8.6' (Linux)." exit 1 fi | | < < | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 |
#!/bin/bash
if [ ! -x "$(command -v tclsh)" ]; then
echo "The program 'tclsh' is apparently not installed."
echo "Please use 'apt-get install tcl8.6' (Linux)."
exit 1
fi
if ! echo "exit [catch {package require tls}]" | tclsh; then
echo "The 'tls' package for Tcl is not installed."
echo "Please use 'apt-get install tcl-tls' (Linux)."
exit 1
fi
if [ ! -x "$(command -v wget)" ] && [ ! -x "$(command -v curl)" ]; then
echo "The programs 'wget' and/or 'curl' are apparently not installed."
echo "Please use 'apt-get install wget' (Linux) or 'brew install wget' (Mac)."
|
| ︙ | ︙ | |||
90 91 92 93 94 95 96 |
PKGR_CLIENT_URI=https://urn.to/r/pkg_client_full
PKGR_TMP_FILE=${PKGR_TMP_DIR}/pkgrd_tmp_${PKGR_TMP_ID}_file.zip
PKGR_GET_OK=0
if [ -x "$(command -v wget)" ]; then
for wgetArg in "" "--no-check-certificate"
do
| | | | | > | | | | > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 |
PKGR_CLIENT_URI=https://urn.to/r/pkg_client_full
PKGR_TMP_FILE=${PKGR_TMP_DIR}/pkgrd_tmp_${PKGR_TMP_ID}_file.zip
PKGR_GET_OK=0
if [ -x "$(command -v wget)" ]; then
for wgetArg in "" "--no-check-certificate"
do
if wget -4 $wgetArg "--output-document=${PKGR_TMP_FILE}" "${PKGR_CLIENT_URI}"; then
if [ -f "${PKGR_TMP_FILE}" ]; then
PKGR_GET_OK=1
break
fi
fi
done
else
for curlArg in "" "--insecure"
do
if curl -4 $curlArg --location "${PKGR_CLIENT_URI}" > "${PKGR_TMP_FILE}"; then
if [ -f "${PKGR_TMP_FILE}" ]; then
PKGR_GET_OK=1
break
fi
fi
done
fi
if [ $PKGR_GET_OK -eq 0 ] || [ ! -f "${PKGR_TMP_FILE}" ]; then
echo "Could not download the package client toolset archive."
exit 1
|
| ︙ | ︙ |