aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormerakor <cem@ckyln.com>2021-07-03 09:18:19 +0000
committermerakor <cem@ckyln.com>2021-07-03 09:18:19 +0000
commit725e6ebb90302730fef3784069a1610083bbb6d3 (patch)
treedd9ce5665a80f347b4cf9cfc758b832970b7f530 /src
parenteecbf33e5c4fcabd9e8b24a1fd442a3d9c3c51f8 (diff)
downloadcpt-725e6ebb90302730fef3784069a1610083bbb6d3.tar.gz
fossil-backend: fix pull and rootdir functions
FossilOrigin-Name: 1f1b7ad14d5b792263bb3e8098c60fb375707e92b4c6f164f22a29b8ff36fffb
Diffstat (limited to 'src')
-rw-r--r--src/cpt-lib.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpt-lib.in b/src/cpt-lib.in
index 6b95ee7..245aa21 100644
--- a/src/cpt-lib.in
+++ b/src/cpt-lib.in
@@ -1656,9 +1656,10 @@ pkg_vcs_pull_fossil() {
# Ensure we have proper permissions to do the pull operation.
if [ -w "$PWD" ] && [ "$uid" != 0 ]; then
+ fossil pull
fossil update
else
- pkg_vcs_as_root "fossil update"
+ pkg_vcs_as_root "fossil pull && fossil update"
fi
}
@@ -1777,8 +1778,7 @@ pkg_vcs_info() {
# We want to remove the initial spacing before the root directory, and
# the leading dash on the root directory.
- rootdir=$(printf '%s\n' "$rootdir" | cut -d ' ' -f2-)
- rootdir=${rootdir%/}
+ rootdir=${rootdir#local-root: *} rootdir=${rootdir%/}
elif [ -f .rsync ]; then
backend=rsync
rootdir=$PWD