Commit fd08398c973b940cdd210a7643c97ef296455850
2023-01-27T23:54:51
verbose levels
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 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 84 85 86 87 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 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396
diff --git a/bin/shpkg b/bin/shpkg
index 61a38d2..1308e0b 100755
--- a/bin/shpkg
+++ b/bin/shpkg
@@ -13,56 +13,56 @@ SHPKG_SHARE_DIR="${SHPKG_DIR}/share/shpkg"
# CLI
if [ "x$1" = "xbuild" ]; then
shift
- verbose shpkg_build "$@"
+ verbose 2 shpkg_build "$@"
exit
elif [ "x$1" = "xclone" ]; then
shift
- verbose shpkg_clone "$@"
+ verbose 2 shpkg_clone "$@"
exit
elif [ "x$1" = "xconfigure" ]; then
shift
- verbose shpkg_configure "$@"
+ verbose 2 shpkg_configure "$@"
exit
elif [ "x$1" = "xfake" ]; then
shift
- verbose shpkg_fake "$@"
+ verbose 2 shpkg_fake "$@"
exit
elif [ "x$1" = "xfetch" ] ||
[ "x$1" = "xf" ]; then
shift
- verbose shpkg_fetch "$@"
+ verbose 2 shpkg_fetch "$@"
exit
elif [ "x$1" = "xinstall" ] ||
[ "x$1" = "xi" ]; then
shift
- verbose shpkg_install "$@"
+ verbose 2 shpkg_install "$@"
exit
elif [ "x$1" = "xpackage" ] ||
[ "x$1" = "xpkg" ]; then
shift
- verbose shpkg_package "$@"
+ verbose 2 shpkg_package "$@"
exit
elif [ "x$1" = "xpull" ] ||
[ "x$1" = "xp" ]; then
shift
- verbose shpkg_pull "$@"
+ verbose 2 shpkg_pull "$@"
exit
elif [ "x$1" = "xremove" ] ||
[ "x$1" = "xrm" ]; then
shift
- verbose shpkg_uninstall "$@"
- verbose shpkg_remove "$@"
+ verbose 2 shpkg_uninstall "$@"
+ verbose 2 shpkg_remove "$@"
exit
elif [ "x$1" = "xuninstall" ]; then
shift
- verbose shpkg_uninstall "$@"
+ verbose 2 shpkg_uninstall "$@"
exit
elif [ "x$1" = "xupdate" ]; then
- verbose shpkg_update
+ verbose 2 shpkg_update
exit
elif [ "x$1" = "xupgrade" ]; then
shift
- verbose shpkg_upgrade "$@"
+ verbose 2 shpkg_upgrade "$@"
exit
fi
diff --git a/share/shpkg/shpkg.subr b/share/shpkg/shpkg.subr
index 03f98e5..3a5f2cd 100644
--- a/share/shpkg/shpkg.subr
+++ b/share/shpkg/shpkg.subr
@@ -13,15 +13,28 @@ err () {
exit "$R"
}
-puts () {
- printf '\33[0;34m'
+verbose_puts () {
+ if [ "x$1" = "x1" ]; then
+ printf '\33[0;34m'
+ elif [ "x$1" = "x2" ]; then
+ printf '\33[0;35m'
+ else
+ err 1 "bad verbose level"
+ fi
+ shift
echo -n "$@"
printf '\33[0m\n'
}
verbose () {
- puts "$@"
- "$@"
+ if [ "x$1" = "x-n" ]; then
+ shift
+ verbose_puts "$@"
+ else
+ verbose_puts "$@"
+ shift
+ "$@"
+ fi
}
# Config
@@ -76,16 +89,16 @@ export PKG_CONFIG_PATH="${SHPKG_LIB_DIR}/pkgconfig"
# Setup
if ! [ -d "${SHPKG_FAKE_DIR}" ]; then
- verbose mkdir -p "${SHPKG_FAKE_DIR}"
+ verbose 1 mkdir -p "${SHPKG_FAKE_DIR}"
fi
if ! [ -d "${SHPKG_PACKAGE_DIR}" ]; then
- verbose mkdir -p "${SHPKG_PACKAGE_DIR}"
+ verbose 1 mkdir -p "${SHPKG_PACKAGE_DIR}"
fi
if ! [ -d "${SHPKG_SRC_DIR}" ]; then
- verbose mkdir -p "${SHPKG_SRC_DIR}"
+ verbose 1 mkdir -p "${SHPKG_SRC_DIR}"
fi
if ! [ -d "${SHPKG_VAR_DB_DIR}" ]; then
- verbose mkdir -p "${SHPKG_VAR_DB_DIR}"
+ verbose 1 mkdir -p "${SHPKG_VAR_DB_DIR}"
fi
# SHA256
@@ -114,13 +127,13 @@ shpkg_clone () {
SHPKG_REPO_GIT_URL="$(shpkg_git_url "${REPO}")"
SHPKG_REPO_BASENAME="$(basename "${SHPKG_REPO_DIR}")"
if ! [ -d "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}" ]; then
- verbose mkdir -p "${SHPKG_SRC_DIR}/${SHPKG_REPO_PARENT_DIR}"
- ( verbose cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_PARENT_DIR}" &&
- verbose git clone "${SHPKG_REPO_GIT_URL}" \
+ verbose 1 mkdir -p "${SHPKG_SRC_DIR}/${SHPKG_REPO_PARENT_DIR}"
+ ( verbose 1 cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_PARENT_DIR}" &&
+ verbose 1 git clone "${SHPKG_REPO_GIT_URL}" \
"${SHPKG_REPO_BASENAME}" &&
- verbose cd "${SHPKG_REPO_BASENAME}" &&
- verbose git submodule init &&
- verbose git submodule update
+ verbose 1 cd "${SHPKG_REPO_BASENAME}" &&
+ verbose 1 git submodule init &&
+ verbose 1 git submodule update
)
fi
done
@@ -133,8 +146,8 @@ shpkg_depends_on () {
shpkg_fetch () {
for REPO; do
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
- ( verbose cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}" &&
- verbose git fetch
+ ( verbose 1 cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}" &&
+ verbose 1 git fetch
)
done
}
@@ -151,8 +164,8 @@ shpkg_git_url () {
shpkg_pull () {
for REPO; do
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
- ( verbose cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}" &&
- verbose git pull; )
+ ( verbose 1 cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}" &&
+ verbose 1 git pull; )
done
}
@@ -160,7 +173,8 @@ shpkg_remove () {
for REPO; do
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
SHPKG_REPO_PARENT_DIR="$(shpkg_src_parent_dir "${REPO}")"
- verbose rm -rf "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}"
+ verbose 1 rm -rf "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}"
+ verbose -n 1 "rmdir ${SHPKG_SRC_DIR}/${SHPKG_REPO_PARENT_DIR}"
rmdir "${SHPKG_SRC_DIR}/${SHPKG_REPO_PARENT_DIR}" 2>/dev/null || true
done
}
@@ -185,19 +199,19 @@ shpkg_version () {
# Building from sources
shpkg_autogen () {
- verbose shpkg_clone "$@"
+ verbose 2 shpkg_clone "$@"
for REPO; do
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
SHPKG_REPO_SRC_DIR="${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}"
if [ -x "${SHPKG_REPO_SRC_DIR}/autogen" ]; then
- ( verbose cd "${SHPKG_REPO_SRC_DIR}" &&
- verbose ./autogen; )
+ ( verbose 1 cd "${SHPKG_REPO_SRC_DIR}" &&
+ verbose 1 ./autogen; )
elif [ -f "${SHPKG_REPO_SRC_DIR}/autogen.sh" ]; then
- ( verbose cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}" &&
- verbose sh autogen.sh; )
+ ( verbose 1 cd "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}" &&
+ verbose 1 sh autogen.sh; )
elif [ -x "${SHPKG_REPO_SRC_DIR}/bootstrap" ]; then
- ( verbose cd "${SHPKG_REPO_SRC_DIR}" &&
- verbose ./bootstrap; )
+ ( verbose 1 cd "${SHPKG_REPO_SRC_DIR}" &&
+ verbose 1 ./bootstrap; )
fi
done
}
@@ -208,11 +222,11 @@ shpkg_build () {
SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
SHPKG_REPO_SRC_DIR="${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}"
if shpkg__tag_is_absent build-done; then
- ( verbose shpkg_configure "${REPO}"; )
+ ( verbose 2 shpkg_configure "${REPO}"; )
SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
if [ -f "${SHPKG_REPO_SRC_DIR}/Makefile" ]; then
- ( verbose cd "${SHPKG_REPO_SRC_DIR}" &&
- verbose make; )
+ ( verbose 1 cd "${SHPKG_REPO_SRC_DIR}" &&
+ verbose 1 make; )
elif [ -f "${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}/CMakeLists.txt" ]; then
cmake --build "${SHPKG_OBJ_DIR}/${SHPKG_REPO_DIR}"
fi
@@ -234,19 +248,19 @@ shpkg_configure () {
SHPKG_REPO_SRC_DIR="${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}"
SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
if shpkg__tag_is_absent configure-done; then
- ( verbose shpkg_autogen "${REPO}"; )
+ ( verbose 2 shpkg_autogen "${REPO}"; )
SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
if ! [ -d "${SHPKG_REPO_FAKE_DIR}" ]; then
- verbose mkdir -p "${SHPKG_REPO_FAKE_DIR}"
+ verbose 1 mkdir -p "${SHPKG_REPO_FAKE_DIR}"
fi
if [ -x "${SHPKG_REPO_SRC_DIR}/configure" ]; then
- ( verbose cd "${SHPKG_REPO_SRC_DIR}" &&
- verbose ./configure --prefix "${SHPKG_PREFIX}"; )
+ ( verbose 1 cd "${SHPKG_REPO_SRC_DIR}" &&
+ verbose 1 ./configure --prefix "${SHPKG_PREFIX}"; )
elif [ -x "${SHPKG_REPO_SRC_DIR}/configure.sh" ]; then
- ( verbose cd "${SHPKG_REPO_SRC_DIR}" &&
- verbose ./configure.sh --prefix "${SHPKG_PREFIX}"; )
+ ( verbose 1 cd "${SHPKG_REPO_SRC_DIR}" &&
+ verbose 1 ./configure.sh --prefix "${SHPKG_PREFIX}"; )
elif [ -f "${SHPKG_REPO_SRC_DIR}/CMakeLists.txt" ]; then
- cmake -S "${SHPKG_REPO_SRC_DIR}" -B "${SHPKG_OBJ_DIR}/${SHPKG_REPO_DIR}" -D CMAKE_INSTALL_PREFIX:PATH="${SHPKG_PREFIX}" -D BUILD_SHARED_LIBS=ON
+ verbose 1 cmake -S "${SHPKG_REPO_SRC_DIR}" -B "${SHPKG_OBJ_DIR}/${SHPKG_REPO_DIR}" -D CMAKE_INSTALL_PREFIX:PATH="${SHPKG_PREFIX}" -D BUILD_SHARED_LIBS=ON
fi
shpkg__tag_write configure-done
fi
@@ -254,20 +268,20 @@ shpkg_configure () {
}
shpkg_fake () {
- verbose shpkg_build "$@"
+ verbose 2 shpkg_build "$@"
for REPO; do
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
SHPKG_REPO_FAKE_DIR="$(shpkg_fake_dir "${REPO}")"
SHPKG_REPO_SRC_DIR="${SHPKG_SRC_DIR}/${SHPKG_REPO_DIR}"
if [ -d "${SHPKG_REPO_FAKE_DIR}" ]; then
- verbose rm -rf "${SHPKG_REPO_FAKE_DIR}"
+ verbose 1 rm -rf "${SHPKG_REPO_FAKE_DIR}"
fi
- verbose mkdir -p "${SHPKG_REPO_FAKE_DIR}"
+ verbose 1 mkdir -p "${SHPKG_REPO_FAKE_DIR}"
if [ -f "${SHPKG_REPO_SRC_DIR}/Makefile" ]; then
- ( verbose cd "${SHPKG_REPO_SRC_DIR}" &&
- verbose make prefix="${SHPKG_REPO_FAKE_DIR}" install; )
+ ( verbose 1 cd "${SHPKG_REPO_SRC_DIR}" &&
+ verbose 1 make prefix="${SHPKG_REPO_FAKE_DIR}" install; )
elif [ -f "${SHPKG_REPO_SRC_DIR}/CMakeLists.txt" ]; then
- cmake --install "${SHPKG_OBJ_DIR}/${SHPKG_REPO_DIR}" --prefix "${SHPKG_REPO_FAKE_DIR}"
+ verbose 1 cmake --install "${SHPKG_OBJ_DIR}/${SHPKG_REPO_DIR}" --prefix "${SHPKG_REPO_FAKE_DIR}"
fi
done
}
@@ -283,18 +297,18 @@ shpkg_package () {
SHPKG_REPO_PACKAGE="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.tgz"
if ! [ -f "${SHPKG_REPO_PACKAGE}" ]; then
SHPKG_REPO_FAKE_DIR="$(shpkg_fake_dir "${REPO}")"
- verbose shpkg_fake "${REPO}"
+ verbose 2 shpkg_fake "${REPO}"
SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
SHPKG_REPO_PACKAGE="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.tgz"
SHPKG_REPO_PACKAGE_CHECKSUM="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.SHA256"
SHPKG_REPO_PACKAGE_DIR="$(dirname "${SHPKG_REPO_PACKAGE}")"
if ! [ -d "${SHPKG_REPO_PACKAGE_DIR}" ]; then
- verbose mkdir -p "${SHPKG_REPO_PACKAGE_DIR}"
+ verbose 1 mkdir -p "${SHPKG_REPO_PACKAGE_DIR}"
fi
- ( verbose cd "${SHPKG_REPO_FAKE_DIR}" &&
- puts "shpkg_checksum > ${SHPKG_REPO_PACKAGE_CHECKSUM}" &&
+ ( verbose 1 cd "${SHPKG_REPO_FAKE_DIR}" &&
+ verbose -n 1 "shpkg_checksum > ${SHPKG_REPO_PACKAGE_CHECKSUM}" &&
shpkg_checksum > "${SHPKG_REPO_PACKAGE_CHECKSUM}" &&
- puts "pax -wz . > ${SHPKG_REPO_PACKAGE}" &&
+ verbose -n 1 "pax -wz . > ${SHPKG_REPO_PACKAGE}" &&
pax -wz . > "${SHPKG_REPO_PACKAGE}" )
fi
done
@@ -310,9 +324,9 @@ shpkg__tag_write() {
SHPKG_REPO_TAG_DIR="${SHPKG_TAG_DIR}/${SHPKG_REPO_DIR}/${SHPKG_REPO_VERSION}"
DATE="$(date +%F\ %T)"
if ! [ -d "${SHPKG_REPO_TAG_DIR}" ]; then
- verbose mkdir -p "${SHPKG_REPO_TAG_DIR}"
+ verbose 1 mkdir -p "${SHPKG_REPO_TAG_DIR}"
fi
- puts "echo ${DATE} > ${SHPKG_REPO_TAG_DIR}/$1"
+ verbose -n 1 "echo ${DATE} > ${SHPKG_REPO_TAG_DIR}/$1"
echo "${DATE}" > "${SHPKG_REPO_TAG_DIR}/$1"
}
@@ -328,21 +342,21 @@ shpkg_install () {
if ! [ -f "${SHPKG_REPO_INSTALLED}" ] ||
! head -n 1 < "${SHPKG_REPO_INSTALLED}" |
grep "Version: ${SHPKG_REPO_VERSION}" >/dev/null; then
- ( verbose shpkg_install_dependencies "${REPO}"; )
- ( verbose shpkg_build "${REPO}"; )
- ( verbose shpkg_package "${REPO}"; )
+ ( verbose 2 shpkg_install_dependencies "${REPO}"; )
+ ( verbose 2 shpkg_build "${REPO}"; )
+ ( verbose 2 shpkg_package "${REPO}"; )
SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
SHPKG_REPO_PACKAGE="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.tgz"
SHPKG_REPO_PACKAGE_CHECKSUM="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.SHA256"
- ( verbose cd "${SHPKG_DIR}" &&
- puts "pax -rdz < ${SHPKG_REPO_PACKAGE}" &&
+ ( verbose 1 cd "${SHPKG_DIR}" &&
+ verbose -n 1 "pax -rdz < ${SHPKG_REPO_PACKAGE}" &&
pax -rdz < "${SHPKG_REPO_PACKAGE}"; )
if ! [ -d "${SHPKG_REPO_INSTALLED_DIR}" ]; then
- verbose mkdir -p "${SHPKG_REPO_INSTALLED_DIR}"
+ verbose 1 mkdir -p "${SHPKG_REPO_INSTALLED_DIR}"
fi
- puts "echo Version: ${SHPKG_REPO_VERSION} > ${SHPKG_REPO_INSTALLED}"
+ verbose -n 1 "echo Version: ${SHPKG_REPO_VERSION} > ${SHPKG_REPO_INSTALLED}"
echo "Version: ${SHPKG_REPO_VERSION}" > "${SHPKG_REPO_INSTALLED}"
- puts "cat ${SHPKG_REPO_PACKAGE_CHECKSUM} >> ${SHPKG_REPO_INSTALLED}"
+ verbose -n 1 "cat ${SHPKG_REPO_PACKAGE_CHECKSUM} >> ${SHPKG_REPO_INSTALLED}"
cat "${SHPKG_REPO_PACKAGE_CHECKSUM}" >> "${SHPKG_REPO_INSTALLED}"
fi
fi
@@ -353,7 +367,7 @@ shpkg_install_dependencies () {
for REPO; do
SHPKG_REPO_DEPENDS_ON="$(shpkg_depends_on "${REPO}")"
if [ "x${SHPKG_REPO_DEPENDS_ON}" != "x" ]; then
- ( verbose shpkg_install ${SHPKG_REPO_DEPENDS_ON}; )
+ ( verbose 2 shpkg_install ${SHPKG_REPO_DEPENDS_ON}; )
fi
done
}
@@ -365,32 +379,32 @@ shpkg_uninstall () {
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
SHPKG_REPO_INSTALLED="${SHPKG_VAR_DB_DIR}/installed/${SHPKG_REPO_DIR}"
if [ -f "${SHPKG_REPO_INSTALLED}" ]; then
- verbose cd "${SHPKG_DIR}"
+ verbose 1 cd "${SHPKG_DIR}"
grep -v : "${SHPKG_REPO_INSTALLED}" |
cut -d '(' -f 2 |
cut -d ')' -f 1 |
while read F; do
if grep -E "^SHA256 \\($F\\) = " "${SHPKG_REPO_INSTALLED}" |
"${SHPKG_SHA256}" -c; then
- verbose rm "$F"
+ verbose 1 rm "$F"
fi
done
- verbose rm "${SHPKG_REPO_INSTALLED}"
+ verbose 1 rm "${SHPKG_REPO_INSTALLED}"
fi
done
}
shpkg_upgrade () {
- verbose shpkg_pull "$@"
- verbose shpkg_build "$@"
- verbose shpkg_package "$@"
- verbose shpkg_install "$@"
+ verbose 2 shpkg_pull "$@"
+ verbose 2 shpkg_build "$@"
+ verbose 2 shpkg_package "$@"
+ verbose 2 shpkg_install "$@"
}
# Meta
shpkg_clean() {
for REPO; do
- ( verbose shpkg_uninstall "${REPO}"; )
+ ( verbose 2 shpkg_uninstall "${REPO}"; )
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
SHPKG_REPO_FAKE_DIR="$(shpkg_fake_dir "${REPO}")"
rm -rf "${SHPKG_REPO_FAKE_DIR}"