This commit is contained in:
emmett1
2017-10-11 18:34:41 +08:00
parent 168f14ca41
commit 8e3fb0d1cb
3 changed files with 22 additions and 32 deletions

View File

@@ -248,8 +248,6 @@ packaging() {
echo "version = $version" >> .pkginfo
echo "release = $release" >> .pkginfo
[ -n "$description" ] && echo "description = $description" >> .pkginfo
[ -n "$homepage" ] && echo "homepage = $homepage" >> .pkginfo
[ -n "$maintainer" ] && echo "maintainer = $maintainer" >> .pkginfo
[ -n "$backup" ] && echo "backup = ${backup[@]}" >> .pkginfo
[ -n "$conflict" ] && echo "conflict = ${conflict[@]}" >> .pkginfo
[ -n "$depends" ] && echo "depends = ${depends[@]}" >> .pkginfo

View File

@@ -17,7 +17,7 @@ color_bcyan='\e[1;36m' #Bold cyan
color_bgray='\e[1;37m' #Bold gray
color_reset='\e[0m' #Reset color
### DECLARE SOME VALUE ###
### SET SOME VALUE ###
CONF_FILE="/etc/scratchpkg.conf"
BUILD_SCRIPT="spkgbuild"
@@ -36,11 +36,11 @@ fi
### FUNCTIONS LOAD BY SCRATCHPKG ###
pushd() {
command pushd "$@" > /dev/null
command pushd "$@" >/dev/null
}
popd() {
command popd "$@" > /dev/null
command popd >/dev/null
}
msg() {
@@ -173,13 +173,8 @@ loadconfigfile() {
if [ -f $CONF_FILE ]; then
. $CONF_FILE
#PACKAGE_DIR=$(cat $CONF_FILE | grep ^'#PACKAGE_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-)
#SOURCE_DIR=$(cat $CONF_FILE | grep ^'#SOURCE_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-)
#WORK_DIR=$(cat $CONF_FILE | grep ^'#WORK_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-)
#PORT_REPO=$(cat $CONF_FILE | grep ^'#PORT_REPO' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-)
#PURGE_FILE=$(cat $CONF_FILE | grep ^'#PURGE_FILE' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-)
else
msg "${color_red}Configuration file not found.${color_reset}"
msgerr "Configuration file not found."
exit 1
fi
@@ -188,7 +183,7 @@ loadconfigfile() {
createtemplate() {
if [ -d $TEMPLATE_NAME ]; then
msg "Error folder ${color_red}$TEMPLATE_NAME${color_reset} already exist"
msg "Error directory ${color_red}$TEMPLATE_NAME${color_reset} already exist"
exit 1
else
mkdir $TEMPLATE_NAME

37
scratch
View File

@@ -130,29 +130,26 @@ showpackageinfo() {
msg "${color_red}$PACKAGE_INFO${color_reset} not exist."
exit 1
else
if [ $(tar -tf "$PACKAGE_INFO" | grep ".pkginfo") ]; then
if [ $(tar -tf "$PACKAGE_INFO" | grep -x ".pkginfo") ]; then
getpkginfofrompkg $PACKAGE_INFO
echo -e "${color_green}package info:${color_reset}"
[ -n "$name" ] && echo "name = $name"
[ -n "$version" ] && echo "version = $version"
[ -n "$release" ] && echo "release = $release"
[ -n "$description" ] && echo "description = $description"
[ -n "$homepage" ] && echo "homepage = $homepage"
[ -n "$maintainer" ] && echo "maintainer = $maintainer"
[ -n "$backup" ] && echo "backup = $backup"
[ -n "$conflict" ] && echo "conflict = $conflict"
[ -n "$depends" ] && echo "depends = $depends"
[ -n "$makedepends" ] && echo "makedepends = $makedepends"
if [ $(tar -tf "$PACKAGE_INFO" | grep ".pkginstall" | cut -d / -f 1 | uniq) ]; then
echo ""
echo -e "${color_green}pkginstall files:${color_reset}"
tar -tf $PACKAGE_INFO .pkginstall | cut -d / -f 2 | sed '/^$/d'
fi
if [ $(tar -tf "$PACKAGE_INFO" | grep ".pkginstall/readme") ]; then
echo -e "${color_green}info:${color_reset}"
[ "$name" ] && echo "name = $name"
[ "$version" ] && echo "version = $version"
[ "$release" ] && echo "release = $release"
[ "$description" ] && echo "description = $description"
[ "$backup" ] && echo "backup = $backup"
[ "$conflict" ] && echo "conflict = $conflict"
[ "$depends" ] && echo "depends = $depends"
[ "$makedepends" ] && echo "makedepends = $makedepends"
echo ""
if [ $(tar -tf "$PACKAGE_INFO" | grep -x ".pkgreadme") ]; then
echo -e "${color_green}readme:${color_reset}"
tar -xf $PACKAGE_INFO .pkginstall/readme -O
tar -xf $PACKAGE_INFO .pkgreadme -O
echo ""
fi
if [ $(tar -tf "$PACKAGE_INFO" | grep -x ".pkginstall") ]; then
echo -e "${color_green}pkginstall files:${color_reset}"
tar -xf $PACKAGE_INFO .pkginstall -O
echo ""
fi
else