Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
refactor(package)
  • Loading branch information
definite committed Jul 5, 2017
1 parent fbadfe5 commit 7f169b7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
11 changes: 5 additions & 6 deletions zanata-package-fedora
Expand Up @@ -53,15 +53,14 @@ LANG=C
### and you need to specify version-release.
###

ScriptDir=$(dirname $(realpath $0))
FunctionScriptFile=${ScriptDir}/zanata-functions
source "$FunctionScriptFile"
trap exit_print_error EXIT

## Variables
SpecRelease=1

SCRIPT_DIR=$(dirname $(readlink -q -f $0))
FUNCTION_SCRIPT_FILE="${SCRIPT_DIR}/zanata-functions"
source "${FUNCTION_SCRIPT_FILE}"
trap exit_print_error EXIT
source "${SCRIPT_DIR}/zanata-rpm-functions"

##=== function definitions Start ===
# is pkgBuild been built in koji
# Valid pkgBuild example: cmake-fedora-1.4.0-1.fc21
Expand Down
14 changes: 7 additions & 7 deletions zanata-package-repo-dnf
Expand Up @@ -36,11 +36,11 @@ LANG=C
### So make sure both ends support rsync.
###
## Default Environment Variable
SCRIPT_DIR=$(dirname $(readlink -q -f $0))
FUNCTION_SCRIPT_FILE=${SCRIPT_DIR}/zanata-functions
source "${FUNCTION_SCRIPT_FILE}"
ScriptDir=$(dirname $(realpath $0))
FunctionScriptFile=${ScriptDir}/zanata-functions
source "$FunctionScriptFile"
trap exit_print_error EXIT
source "${SCRIPT_DIR}/zanata-rpm-functions"
source "${ScriptDir}/zanata-rpm-functions"


### ENVIRONMENT
Expand Down Expand Up @@ -147,7 +147,7 @@ print_status " Module=$Module"

## Get Package name
case $Module in
zanata-client )
zanata-platform )
PackageName=zanata-cli-bin
;;
* )
Expand Down Expand Up @@ -277,8 +277,8 @@ for fr in ${FEDORA_RELEASES}; do
fi
else
print_status " creating ${RpmPath}"
mock -r "${fr}-${arch}" -D "dist .${DistTag}" --resultdir "${RESULT_DIR}" --rebuild "${SrpmPath}"
cp -v ${RESULT_DIR}/${RpmFilename} ${RpmDir}
# mock -r "${fr}-${arch}" -D "dist .${DistTag}" --resultdir "${RESULT_DIR}" --rebuild "${SrpmPath}"
# cp -v ${RESULT_DIR}/${RpmFilename} ${RpmDir}
fi
update_dnf_repo_dir $fr $arch
fi
Expand Down

0 comments on commit 7f169b7

Please sign in to comment.