Compare commits

..

No commits in common. "master" and "3.6.0" have entirely different histories.

16
debtap
View File

@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
Version=3.6.3
Version=3.6.0
# Defining colors and bold letters
lightgreen='\e[1;32m'
@ -67,7 +67,7 @@ if [[ $output == set ]]; then
if [[ "${optionsarray[$i+1]}" == "" ]]; then
echo -e "${red}Error: You haven't specified an output directory${NC}"; exit 1;
elif [ -d "${optionsarray[$i+1]}" ]; then
outputdirectory="$(realpath "${optionsarray[$i+1]}")"
outputdirectory="${optionsarray[$i+1]}"
else
echo -e "${red}Error: No output directory or invalid output directory${NC}"; exit 1;
fi
@ -131,7 +131,7 @@ elif [[ $update == set ]]; then
echo -e "${red}Downloading failed. Exiting...${NC}"; exit 1
else
echo -e "${lightgreen}==>${NC} ${bold}Generating extended base group packages list...${normal}"
rm -rf /var/cache/debtap/extended-base-packages-list
rm -rf /var/cache/debtap/base-packages
for i in $(pacman -Qi base 2> /dev/null | grep ^Depends | cut -d: -f2); do echo "$i" >> /var/cache/debtap/base-packages; done
for i in $(cat /var/cache/debtap/base-packages); do pactree -lu "$i" >> /var/cache/debtap/extended-base-packages-list-temp; done
sort -u /var/cache/debtap/extended-base-packages-list-temp > /var/cache/debtap/extended-base-packages-list; echo >> /var/cache/debtap/extended-base-packages-list
@ -2784,7 +2784,7 @@ packages-names-translator() {
rm -rf result
fi
# Special rules for mandatory dependencies
# Special rules for non optional dependencies
if [[ -e dependencies-initial-check-list ]]; then
grep -q gtk tempfile17 && echo hicolor-icon-theme >> tempfile17
grep -q ^Python-Version: control && echo python$(grep ^Python-Version: control | gawk '{print $2}' | sed s'/\.//g') >> tempfile17
@ -2950,7 +2950,7 @@ if [[ -e conffiles ]]; then
rm -rf tempfile
fi
# Generating mandatory dependencies fields
# Generating non optional dependencies fields
# Creating test package for check with namcap
tar --force-local -pcf test.pkg.tar --exclude='pkgbuildinstallations*' --exclude={control,preinst,postinst,prerm,posrtrm,conffiles,*-untranslated-names-only} * .PKGINFO 2> /dev/null
namcap -r sodepends -m test.pkg.tar | grep 'dependency-detected-not-included\|library-no-package-associated' | gawk '{print $3,$4}' > namcap-checks
@ -3465,11 +3465,11 @@ if [[ -e pkgbuildinstallations1 ]] || [[ -e pkgbuildinstallations2 ]] || [[ -e p
fi
fi
echo -e "\n}" >> PKGBUILD
echo "$output_directory"
# Moving PKGBUILD (and .INSTALL, if it exists) and announcing its creation
pkgname="$(grep '^pkgname=' PKGBUILD | sed s'/^pkgname=//')"
if [[ $output == set ]]; then
pkgbuild_location="$outputdirectory/$pkgname-PKGBUILD"
pkgbuild_location="$(dirname "$outputdirectory/$pkgname-PKGBUILD")"
rm -rf "$pkgbuild_location" 2> /dev/null
mkdir "$pkgbuild_location" 2> /dev/null
if [[ $? != 0 ]]; then
@ -3486,7 +3486,7 @@ if [[ $output == set ]]; then
echo -e "${lightgreen}==>${NC} ${bold}PKGBUILD is now located in${normal} ${lightblue}\"$pkgbuild_location\"${NC} ${bold}and ready to be edited${normal}"
fi
else
pkgbuild_location=""$(dirname "$package_with_full_path")"/$pkgname-PKGBUILD"
pkgbuild_location="$(dirname ""$(dirname "$package_with_full_path")"/$pkgname-PKGBUILD")"
rm -rf "$pkgbuild_location" 2> /dev/null
mkdir "$pkgbuild_location" 2> /dev/null
if [[ $? != 0 ]]; then