Compare commits
No commits in common. "d4306a3f7e6fb8460bfdee2d7aede16ff59b537d" and "850ca56ff74c916850cd34e5b995ecff7c9a45a0" have entirely different histories.
d4306a3f7e
...
850ca56ff7
@ -27,7 +27,7 @@
|
||||
|
||||
# Check if we are in a git repo
|
||||
if ! git status >/dev/null; then
|
||||
printf "%s\n" "Not a git repo... exiting" >> /dev/stderr
|
||||
echo "Not a git repo... exiting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -46,20 +46,19 @@ fi
|
||||
# This will likely exit firh error, because repoman
|
||||
# has to download some files (metadata.xsd)
|
||||
# We do that so we can truthfully test the actual latest commit
|
||||
printf "%s\n" \
|
||||
">>> Starting full test" \
|
||||
"Running repoman -Idix"
|
||||
echo ">>> Starting full test"
|
||||
echo "Running repoman -Idix"
|
||||
repoman -Idix
|
||||
printf "%s\n" "Running pkgcheck scan"
|
||||
echo "Running pkgcheck scan"
|
||||
pkgcheck scan
|
||||
|
||||
|
||||
printf "%s\n" ">>> Starting latest commit test"
|
||||
echo ">>> Starting latest commit test"
|
||||
|
||||
test_success=true
|
||||
|
||||
# Use pkgchek
|
||||
printf "%s\n" "Running pkgcheck scan --commits"
|
||||
echo "Running pkgcheck scan --commits"
|
||||
pkgcheck scan --commits || test_success=false
|
||||
|
||||
# Iterate through changed files in last commit
|
||||
@ -79,9 +78,9 @@ do
|
||||
|
||||
if cd "${commit_dir}"
|
||||
then
|
||||
printf "\n%s\n" \
|
||||
"Directory $(pwd):" \
|
||||
"Running repoman -Idix"
|
||||
echo
|
||||
echo "Directory $(pwd):"
|
||||
echo "Running repoman -Idix"
|
||||
repoman -Idix || test_success=false
|
||||
cd - >/dev/null || return
|
||||
fi
|
||||
@ -90,7 +89,7 @@ done
|
||||
# If any of the QA tools fail the test will fail
|
||||
if [ ${test_success} = false ]
|
||||
then
|
||||
printf "%s\n" ">>> Exiting with failure due to previous errors..." >> /dev/stderr
|
||||
echo ">>> Exiting with failure due to previous errors..."
|
||||
exit 1
|
||||
else
|
||||
exit 0
|
||||
|
@ -69,12 +69,8 @@ do
|
||||
done
|
||||
|
||||
# Output info with colors.
|
||||
purple=$'\e[1;35m'
|
||||
esc=$'\e[0m'
|
||||
|
||||
printf "%s\n" \
|
||||
"${purple}${PACKAGE}${esc}" \
|
||||
" ${purple}Portage:${esc}${PORTPACK_VERS}" \
|
||||
" ${purple}Overlay:${esc}${OVERPACK_VERS}"
|
||||
echo -e "\e[1;33m${PACKAGE}\e[0m"
|
||||
echo -e " \e[1;35mPortage:\e[0m${PORTPACK_VERS}"
|
||||
echo -e " \e[1;35mOverlay:\e[0m${OVERPACK_VERS}"
|
||||
fi
|
||||
done
|
||||
|
@ -46,12 +46,11 @@ reset="$(tput sgr0)"
|
||||
|
||||
|
||||
ok_msg() {
|
||||
printf "%s\n" "${bold}${green}* ${white}${1}${reset}"
|
||||
echo "${bold}${green}* ${white}${1}${reset}"
|
||||
}
|
||||
|
||||
err_msg() {
|
||||
# redirect error messages to standard error stream
|
||||
printf "%s\n" "${bold}${red}* ${white}${1}${reset}" >> /dev/stderr
|
||||
echo "${bold}${red}* ${white}${1}${reset}"
|
||||
}
|
||||
|
||||
usage() {
|
||||
@ -104,7 +103,7 @@ do
|
||||
if [ "${known_unique#*${pkg}}" = "${known_unique}" ]
|
||||
then
|
||||
nnuniq=$((nnuniq + 1))
|
||||
printf "\n"
|
||||
echo
|
||||
ok_msg "Package ${nnuniq} ${pkg}:"
|
||||
use_eix --exact --force-color "${pkg}"
|
||||
fi
|
||||
|
@ -36,5 +36,5 @@ then
|
||||
su root -c "rm -fr ${cache}" || exit 1
|
||||
fi
|
||||
else
|
||||
printf "%s\n" "No pre-generated md5-cache found in ${cache}" >> /dev/stderr
|
||||
echo "No pre-generated md5-cache found in ${cache}"
|
||||
fi
|
||||
|
@ -34,9 +34,8 @@ package="${package_directory%/}"
|
||||
|
||||
|
||||
error_no_version() {
|
||||
printf "%s\n" \
|
||||
"[ERROR]: No version given" \
|
||||
" Ran with option: ${1}" >> /dev/stderr
|
||||
echo "[ERROR]: No version given"
|
||||
echo " Ran with option: ${1}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
@ -46,11 +45,11 @@ git add .
|
||||
case "${1}"
|
||||
in
|
||||
"" )
|
||||
printf "%s\n" "[DEBUG]: no additional arguments/options given" >> /dev/stderr
|
||||
echo "[DEBUG]: no additional arguments/options given"
|
||||
repoman commit
|
||||
;;
|
||||
-b | --bump )
|
||||
printf "%s\n" "[DEBUG]: to be: ${package}: bump to ${2}"
|
||||
echo "[DEBUG]: to be: ${package}: bump to ${2}"
|
||||
if [ -n "${2}" ]
|
||||
then
|
||||
repoman commit -m "${package}: bump to ${2}"
|
||||
@ -59,7 +58,7 @@ in
|
||||
fi
|
||||
;;
|
||||
-d | --drop )
|
||||
printf "%s\n" "[DEBUG]: to be: ${package}: drop old ${2}"
|
||||
echo "[DEBUG]: to be: ${package}: drop old ${2}"
|
||||
if [ -n "${2}" ]
|
||||
then
|
||||
repoman commit -m "${package}: drop old ${2}"
|
||||
@ -68,11 +67,11 @@ in
|
||||
fi
|
||||
;;
|
||||
-* )
|
||||
printf "%s\n" "[ERROR]: Unknown option ${1}" >> /dev/stderr
|
||||
echo "[ERROR]: Unknown option ${1}"
|
||||
exit 1
|
||||
;;
|
||||
* )
|
||||
printf "%s\n" "[DEBUG]: to be: ${package}: ${*}"
|
||||
echo "[DEBUG]: to be: ${package}: ${*}"
|
||||
repoman commit -m "${package}: ${*}"
|
||||
;;
|
||||
esac
|
||||
|
@ -54,7 +54,7 @@ do
|
||||
# we want this to be privileged on Gentoo systems
|
||||
if [ "$(whoami)" != root ] && [ -z "${EPREFIX}" ]
|
||||
then
|
||||
printf "%s\n" "Switching to the root account"
|
||||
echo "Switching to the root account"
|
||||
su root -c "ebuild ${ebuild} clean test merge"
|
||||
else
|
||||
ebuild "${ebuild}" clean test merge
|
||||
|
@ -36,8 +36,9 @@ command_exists() {
|
||||
if command -v "${1}" >/dev/null
|
||||
then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
if command_exists tput
|
||||
@ -57,7 +58,7 @@ eprefix_addpath() {
|
||||
PATH=${1}:${PATH}
|
||||
export PATH
|
||||
else
|
||||
printf "%s\n" "${eprefix_warn} ${1} not found" >> /dev/stderr
|
||||
echo "${eprefix_warn} ${1} not found"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -67,7 +68,7 @@ eprefix_addman() {
|
||||
MANPATH=${1}:${MANPATH}
|
||||
export MANPATH
|
||||
else
|
||||
printf "%s\n" "${eprefix_warn} ${1} not found" >> /dev/stderr
|
||||
echo "${eprefix_warn} ${1} not found"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -94,10 +95,9 @@ case ${-} in
|
||||
:
|
||||
;;
|
||||
* )
|
||||
printf "%s\n" \
|
||||
"${eprefix_bad} Error: not a login shell" \
|
||||
"${eprefix_bad} Run: source ${0}" \
|
||||
">>> Exiting the shell" >> /dev/stderr
|
||||
echo "${eprefix_bad} Error: not a login shell"
|
||||
echo "${eprefix_bad} Run: source ${0}"
|
||||
echo ">>> Exiting the shell"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@ -105,9 +105,8 @@ esac
|
||||
# Exit if eprefix does not exist
|
||||
if [ ! -d "${EPREFIX}" ]
|
||||
then
|
||||
printf "%s\n" \
|
||||
"${eprefix_bad} No ${EPREFIX} found!" \
|
||||
">>> Exiting the shell" >> /dev/stderr
|
||||
echo "${eprefix_bad} No ${EPREFIX} found!"
|
||||
echo ">>> Exiting the shell"
|
||||
sleep 3
|
||||
exit 1
|
||||
fi
|
||||
@ -179,42 +178,44 @@ FEATURES="${FEATURES} -usersandbox -sandbox"
|
||||
export FEATURES
|
||||
|
||||
# Check if we are on a prefix profile
|
||||
printf "\n"
|
||||
echo ""
|
||||
if command_exists eselect
|
||||
then
|
||||
eprofile="$(eselect profile show)"
|
||||
|
||||
if [[ "${eprofile}" == *prefix* ]]
|
||||
then
|
||||
printf "%s\n" "${eprefix_good} ${eprofile}"
|
||||
echo "${eprefix_good} ${eprofile}"
|
||||
else
|
||||
printf "%s\n" "${eprefix_bad} You are not on a prefix profile" >> /dev/stderr
|
||||
echo "${eprefix_bad} You are not on a prefix profile"
|
||||
fi
|
||||
|
||||
unset eprofile
|
||||
else
|
||||
printf "%s\n" "${eprefix_bad} Could not determine running profile" >> /dev/stderr
|
||||
echo "${eprefix_bad} Could not determine running profile"
|
||||
fi
|
||||
|
||||
|
||||
# >>> Finish
|
||||
|
||||
printf "\n%s\n" \
|
||||
">>> Sourced the eprefix script\n" \
|
||||
"${eprefix_good} Prefix: ${EPREFIX}" \
|
||||
"${eprefix_good} Packages: $(eprefix_packages)" \
|
||||
"${eprefix_good} In World: $(eprefix_world)" \
|
||||
"${eprefix_good} Have fun! ;-)"
|
||||
echo ""
|
||||
echo ">>> Sourced the eprefix script"
|
||||
echo ""
|
||||
echo "${eprefix_good} Prefix: ${EPREFIX}"
|
||||
echo "${eprefix_good} Packages: $(eprefix_packages)"
|
||||
echo "${eprefix_good} In World: $(eprefix_world)"
|
||||
echo "${eprefix_good} Have fun! ;-)"
|
||||
|
||||
|
||||
if command_exists emerge
|
||||
then
|
||||
printf "\n%s\n" ">>> Environment ready"
|
||||
echo ""
|
||||
echo ">>> Environment ready"
|
||||
else
|
||||
printf "\n%s\n" \
|
||||
"${eprefix_bad} Could not locate emerge" \
|
||||
"${eprefix_bad} Environment may be broken" \
|
||||
">>> Continuing anyway..." >> /dev/stderr
|
||||
echo ""
|
||||
echo "${eprefix_bad} Could not locate emerge"
|
||||
echo "${eprefix_bad} Environment may be broken"
|
||||
echo ">>> Continuing anyway..."
|
||||
fi
|
||||
|
||||
|
||||
|
@ -31,10 +31,9 @@ export PATH
|
||||
|
||||
if [ -z "${1}" ]
|
||||
then
|
||||
printf "%s\n" \
|
||||
"No overlay names given" \
|
||||
"Please give at least one overlay name as a commandline argument" \
|
||||
"Exiting" >> /dev/stderr
|
||||
echo "No overlay names given"
|
||||
echo "Please give at least one overlay name as a commandline argument"
|
||||
echo "Exiting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -44,5 +43,5 @@ do
|
||||
do
|
||||
euscan --nocolor --quiet "${ebuild}" | tee -a "euscan-${overlay}.log"
|
||||
done
|
||||
printf "%s\n" ">>> Done scanning ${overlay}"
|
||||
echo ">>> Done scanning ${overlay}"
|
||||
done
|
||||
|
@ -21,8 +21,8 @@
|
||||
function scanning(){
|
||||
EUSCAN=$(euscan --nocolor --quiet "$1")
|
||||
if [ -n "$EUSCAN" ]; then
|
||||
printf "%s\n" "=============== NOW: $(find ./* -mindepth 2 -maxdepth 2 -name ''"$1"'*.ebuild' | tail -1) =================
|
||||
$(printf "%s\n" "$EUSCAN" | tail -1)"
|
||||
echo "=============== NOW: $(find ./* -mindepth 2 -maxdepth 2 -name ''"$1"'*.ebuild' | tail -1) =================
|
||||
$(echo -e "$EUSCAN" | tail -1)"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -33,7 +33,7 @@ function folder(){
|
||||
|
||||
for FILE in */*
|
||||
do
|
||||
PACKAGE=$(printf "%s\n" "$FILE" | grep -Eo '[A-z0-9_-]+$')
|
||||
PACKAGE=$(echo "$FILE" | grep -Eo '[A-z0-9_-]+$')
|
||||
PACKAGES+=("$PACKAGE")
|
||||
done
|
||||
|
||||
@ -47,15 +47,14 @@ function folder(){
|
||||
wait "$j"
|
||||
done
|
||||
|
||||
printf "%s\n" ">>> Done scanning $1"
|
||||
echo -n ">>> Done scanning $1"
|
||||
}
|
||||
|
||||
function nofolder(){
|
||||
if [ -z "${1}" ]; then
|
||||
printf "%s\n" \
|
||||
"No overlay names given" \
|
||||
"Please give at least one overlay name as a commandline argument" \
|
||||
"Exiting" >> /dev/stderr
|
||||
echo "No overlay names given"
|
||||
echo "Please give at least one overlay name as a commandline argument"
|
||||
echo "Exiting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -71,23 +70,23 @@ do
|
||||
wait "$j"
|
||||
done
|
||||
|
||||
printf "%s\n" ">>> Done scanning ${overlay}"
|
||||
echo -n ">>> Done scanning ${overlay}"
|
||||
done
|
||||
}
|
||||
|
||||
function help(){
|
||||
printf "%s\n" \
|
||||
"You can use:" \
|
||||
"* -r or --repo <HERE-REPO-NAME>" \
|
||||
"* -f or --folder <FOLDER-NAME>\n" \
|
||||
"Example of usage" \
|
||||
"./euscan-parallel -r src_prepare-overlay" \
|
||||
"./euscan-parallel -f ~/git/src_prepare-overlay"
|
||||
echo "You can use:"
|
||||
echo "* -r or --repo <HERE-REPO-NAME>"
|
||||
echo "* -f or --folder <FOLDER-NAME>"
|
||||
echo
|
||||
echo "Example of usage"
|
||||
echo "./euscan-parallel -r src_prepare-overlay"
|
||||
echo "./euscan-parallel -f ~/git/src_prepare-overlay"
|
||||
}
|
||||
|
||||
function main(){
|
||||
[ "$(whereis eix | wc -w)" -le "1" ] && { printf "%s\n" "The eix is NOT installed" >> /dev/stderr; exit; }
|
||||
[ "$(whereis euscan | wc -w)" -le "1" ] && { printf "%s\n" "The euscan is NOT installed" >> /dev/stderr; exit; }
|
||||
[ "$(whereis eix | wc -w)" -le "1" ] && { echo "The eix is NOT installed"; exit; }
|
||||
[ "$(whereis euscan | wc -w)" -le "1" ] && { echo "The euscan is NOT installed"; exit; }
|
||||
case $1 in
|
||||
-h|--help)
|
||||
help
|
||||
@ -99,7 +98,7 @@ function main(){
|
||||
folder "$2" | tee -a "euscan-$(date -I).log"
|
||||
;;
|
||||
*)
|
||||
printf "%s\n" "No found variable" >> /dev/stderr; printf "\n"; help
|
||||
echo "No found variable"; echo; help
|
||||
esac
|
||||
}
|
||||
|
||||
|
@ -26,7 +26,7 @@ export PATH
|
||||
|
||||
|
||||
emsg() {
|
||||
printf "%s\n" "$(tput bold)$(tput setaf 6)>>> $(tput setaf 4)$(date +%H:%M:%S)$(tput setaf 7) ${*} $(tput sgr0)"
|
||||
echo "$(tput bold)$(tput setaf 6)>>> $(tput setaf 4)$(date +%H:%M:%S)$(tput setaf 7) ${*} $(tput sgr0)"
|
||||
}
|
||||
|
||||
edie() {
|
||||
|
@ -74,15 +74,15 @@ main() {
|
||||
ebuild="$(basename "$(pwd)")-9999.ebuild"
|
||||
if [ ! -f "${ebuild}" ]
|
||||
then
|
||||
printf "%s\n" "${ebuild_template}" > "${ebuild}"
|
||||
echo "${ebuild_template}" > "${ebuild}"
|
||||
else
|
||||
printf "%s\n" "Already exists: ${ebuild}" >> /dev/stderr
|
||||
echo "Already exists: ${ebuild}"
|
||||
fi
|
||||
if [ ! -f "metadata.xml" ]
|
||||
then
|
||||
printf "%s\n" "${metadata_template}" > "metadata.xml"
|
||||
echo "${metadata_template}" > "metadata.xml"
|
||||
else
|
||||
printf "%s\n" "Already exists: metadata.xml" >> /dev/stderr
|
||||
echo "Already exists: metadata.xml"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -91,11 +91,10 @@ if [ -f ../../profiles/repo_name ]
|
||||
then
|
||||
main
|
||||
else
|
||||
printf "%s\n" \
|
||||
"Are you in a overlay repo?" \
|
||||
"To use this script successfully:" \
|
||||
"1. Create a \${CATEGOTY}/\${PN} directory" \
|
||||
"2. Change directory to it" \
|
||||
"3. Execute ${0}" >> /dev/stderr
|
||||
echo "Are you in a overlay repo?"
|
||||
echo "To use this script successfully:"
|
||||
echo "1. Create a \${CATEGOTY}/\${PN} directory"
|
||||
echo "2. Change directory to it"
|
||||
echo "3. Execute ${0}"
|
||||
exit 1
|
||||
fi
|
||||
|
2
src/pn
2
src/pn
@ -26,4 +26,4 @@ trap 'exit 128' INT
|
||||
cd "${1:-$(pwd)}" || exit 1
|
||||
|
||||
path="$(git rev-parse --show-prefix)"
|
||||
printf "%s\n" "${path%/}"
|
||||
echo "${path%/}"
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
printf "%s\n" "Must specify a file to modify..."
|
||||
echo "Must specify a file to modify..."
|
||||
exit 1
|
||||
fi
|
||||
regex='^=?(\S+)(?:-[[:digit:]]+\S*)(\s)(\S+)$'
|
||||
|
@ -36,13 +36,12 @@ main() {
|
||||
case ${1}
|
||||
in
|
||||
-h | -help | --help )
|
||||
printf "%s\n" \
|
||||
"Usage: ${0}" \
|
||||
"Performed in this script:" \
|
||||
"1. remove Manifest file" \
|
||||
"2. regen Manifest with 'repoman manifest'" \
|
||||
"3. Check with 'repoman -Idx full'" \
|
||||
"4. Check with 'pkgcheck scan'"
|
||||
echo "Usage: ${0}"
|
||||
echo "Performed in this script:"
|
||||
echo "1. remove Manifest file"
|
||||
echo "2. regen Manifest with 'repoman manifest'"
|
||||
echo "3. Check with 'repoman -Idx full'"
|
||||
echo "4. Check with 'pkgcheck scan'"
|
||||
;;
|
||||
* )
|
||||
main
|
||||
|
@ -48,13 +48,12 @@ ignored_dirs=(
|
||||
# This will likely exit firh error, because repoman
|
||||
# has to download some files (metadata.xsd)
|
||||
# We do that so we can truthfully test the actual latest commit
|
||||
printf "%s\n" \
|
||||
">>> Starting full test" \
|
||||
"Running repoman -Idix"
|
||||
echo ">>> Starting full test"
|
||||
echo "Running repoman -Idix"
|
||||
repoman -Idix
|
||||
|
||||
|
||||
printf "%s\n" ">>> Starting latest commit test"
|
||||
echo ">>> Starting latest commit test"
|
||||
|
||||
# If any of the QA checks fail the test will fail
|
||||
test_success=true
|
||||
@ -71,16 +70,17 @@ do
|
||||
do
|
||||
if [[ "${commit_dir}" = *"${i_dir}"* ]]
|
||||
then
|
||||
printf "\n%s\n" "Ignoring ${commit_dir}"
|
||||
echo
|
||||
echo "Ignoring ${commit_dir}"
|
||||
continue 2
|
||||
fi
|
||||
done
|
||||
|
||||
if cd "${commit_dir}"
|
||||
then
|
||||
printf "\n%s\n" \
|
||||
"Checking ${commit_dir}" \
|
||||
"Running repoman -Idix"
|
||||
echo
|
||||
echo "Checking ${commit_dir}"
|
||||
echo "Running repoman -Idix"
|
||||
repoman -Idix || test_success="false"
|
||||
cd - >/dev/null || return
|
||||
fi
|
||||
@ -88,9 +88,9 @@ done
|
||||
|
||||
if [ "${test_success}" = "false" ]
|
||||
then
|
||||
printf "%s\n" ">>> Exiting with failure due to previous errors" >> /dev/stderr
|
||||
echo ">>> Exiting with failure due to previous errors"
|
||||
exit 1
|
||||
else
|
||||
printf "%s\n" ">>> Exiting successfully"
|
||||
echo ">>> Exiting successfully"
|
||||
exit 0
|
||||
fi
|
||||
|
15
test.sh
15
test.sh
@ -30,15 +30,16 @@ exit_result=0
|
||||
run_test() {
|
||||
for file in ${2}
|
||||
do
|
||||
printf "%s\n" "File ${file}... checking"
|
||||
echo "File ${file}... checking"
|
||||
if command "${1}" "${file}"
|
||||
then
|
||||
printf "%s\n" " file is correct"
|
||||
echo " file is correct"
|
||||
else
|
||||
printf "%s\n" " there were errors found in the file" >> /dev/stderr
|
||||
echo " there were errors found in the file"
|
||||
exit_result=1
|
||||
fi
|
||||
printf "%s\n\n" "Done: ${file}"
|
||||
echo "Done: ${file}"
|
||||
echo
|
||||
done
|
||||
}
|
||||
|
||||
@ -51,9 +52,11 @@ run_test pylint "${py_files}"
|
||||
|
||||
if [ ${exit_result} = 0 ]
|
||||
then
|
||||
printf "%s\n" "No errors reported" "Exiting successfully"
|
||||
echo "No errors reported"
|
||||
echo "Exiting successfully"
|
||||
exit ${exit_result}
|
||||
else
|
||||
printf "%s\n" "Some errors reported" "Exiting without success" >> /dev/stderr
|
||||
echo "Some errors reported"
|
||||
echo "Exiting without success"
|
||||
exit ${exit_result}
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user