Commit 7371e8eb authored by Boris Yumankulov's avatar Boris Yumankulov Committed by Vitaly Lipatov

returned deleted apostrophe (eterbug #17278)

parent fd79226d
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2013-2016 Etersoft # Copyright (C) 2013-2016 Etersoft
# Copyright (C) 2013-2016 Vitaly Lipatov <lav@etersoft.ru> # Copyright (C) 2013-2016 Vitaly Lipatov <lav@etersoft.ru>
...@@ -117,6 +117,6 @@ epm_assure() ...@@ -117,6 +117,6 @@ epm_assure()
local textpackage local textpackage
[ -n "$PACKAGEVERSION" ] && textpackage=" >= $PACKAGEVERSION" [ -n "$PACKAGEVERSION" ] && textpackage=" >= $PACKAGEVERSION"
warning 'Cant assure in $CMD command from $PACKAGE$textpackage package' warning 'Can'\''t assure in $CMD command from $PACKAGE$textpackage package'
return 1 return 1
} }
...@@ -30,7 +30,7 @@ epm_install_files_alt() ...@@ -30,7 +30,7 @@ epm_install_files_alt()
# do repack if needed # do repack if needed
if __epm_repack_if_needed $files ; then if __epm_repack_if_needed $files ; then
[ -n "$repacked_pkgs" ] || fatal 'Cant convert $files' [ -n "$repacked_pkgs" ] || fatal 'Can'\''t convert $files'
files="$repacked_pkgs" files="$repacked_pkgs"
fi fi
......
...@@ -28,7 +28,7 @@ epm_install_files_apt_dpkg() ...@@ -28,7 +28,7 @@ epm_install_files_apt_dpkg()
fi fi
if __epm_repack_if_needed $files ; then if __epm_repack_if_needed $files ; then
[ -n "$repacked_pkgs" ] || fatal 'Cant convert $files' [ -n "$repacked_pkgs" ] || fatal 'Can'\''t convert $files'
files="$repacked_pkgs" files="$repacked_pkgs"
fi fi
......
...@@ -31,7 +31,7 @@ __emerge_install_ebuild() ...@@ -31,7 +31,7 @@ __emerge_install_ebuild()
# load ebuild and get vars # load ebuild and get vars
. $(pwd)/$EBUILD . $(pwd)/$EBUILD
[ -n "$SRC_URI" ] || fatal 'Cant load SRC_URI from $EBUILD' [ -n "$SRC_URI" ] || fatal 'Can'\''t load SRC_URI from $EBUILD'
# try to detect tarballs # try to detect tarballs
local TARBALLS= local TARBALLS=
......
...@@ -23,7 +23,7 @@ epm_install_files_rpm() ...@@ -23,7 +23,7 @@ epm_install_files_rpm()
[ -z "$files" ] && return [ -z "$files" ] && return
if __epm_repack_if_needed $files ; then if __epm_repack_if_needed $files ; then
[ -n "$repacked_pkgs" ] || fatal 'Cant convert $files' [ -n "$repacked_pkgs" ] || fatal 'Can'\''t convert $files'
files="$repacked_pkgs" files="$repacked_pkgs"
fi fi
......
...@@ -46,7 +46,7 @@ __epm_pack_run_handler() ...@@ -46,7 +46,7 @@ __epm_pack_run_handler()
#info "Running $($script --description 2>/dev/null) ..." #info "Running $($script --description 2>/dev/null) ..."
# TODO: add url info here # TODO: add url info here
( unset EPMCURDIR ; export PATH=$SCPATH ; export HOME=$(pwd) ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" "$url") || fatal ( unset EPMCURDIR ; export PATH=$SCPATH ; export HOME=$(pwd) ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" "$url") || fatal
returntarname="$(cat "$filefortarname")" || fatal 'pack script $repackcode didnt set tarname' returntarname="$(cat "$filefortarname")" || fatal 'pack script $repackcode didn'\''t set tarname'
local i local i
for i in $returntarname ; do for i in $returntarname ; do
...@@ -63,7 +63,7 @@ __epm_pack() ...@@ -63,7 +63,7 @@ __epm_pack()
local URL="$4" local URL="$4"
# fills returntarname with packed tar # fills returntarname with packed tar
__epm_pack_run_handler "$@" || fatal 'Cant find pack script for packname $packname' __epm_pack_run_handler "$@" || fatal 'Can'\''t find pack script for packname $packname'
if [ -n "$download_only" ] ; then if [ -n "$download_only" ] ; then
mv $returntarname $EPMCURDIR mv $returntarname $EPMCURDIR
...@@ -189,7 +189,7 @@ esac ...@@ -189,7 +189,7 @@ esac
__download_pkg_urls __download_pkg_urls
pkg_urls= pkg_urls=
[ -n "$pkg_files" ] || fatal 'Cant download $tarname' [ -n "$pkg_files" ] || fatal 'Can'\''t download $tarname'
tarname="$(realpath "$pkg_files")" tarname="$(realpath "$pkg_files")"
elif [ -d "$tarname" ] ; then elif [ -d "$tarname" ] ; then
tarname="$(realpath "$tarname")" tarname="$(realpath "$tarname")"
......
...@@ -333,7 +333,7 @@ epm_remove() ...@@ -333,7 +333,7 @@ epm_remove()
APTOPTIONS="--simulate" APTOPTIONS="--simulate"
;; ;;
*) *)
fatal 'dont yet support --simulate for $PMTYPE' fatal 'don'\''t yet support --simulate for $PMTYPE'
return return
;; ;;
esac esac
......
...@@ -28,7 +28,7 @@ __epm_removerepo_alt_grepremove() ...@@ -28,7 +28,7 @@ __epm_removerepo_alt_grepremove()
rl="$1" rl="$1"
else else
rl="$( epm --quiet repolist 2>/dev/null | grep -F "$1")" rl="$( epm --quiet repolist 2>/dev/null | grep -F "$1")"
[ -z "$rl" ] && warning 'Cant find '$1' in the repos (see # epm repolist output)' && return 1 [ -z "$rl" ] && warning 'Can'\''t find '$1' in the repos (see # epm repolist output)' && return 1
fi fi
echo "$rl" | while read rp ; do echo "$rl" | while read rp ; do
# TODO: print removed lines # TODO: print removed lines
......
...@@ -152,7 +152,7 @@ __prepare_source_package() ...@@ -152,7 +152,7 @@ __prepare_source_package()
fi fi
# it is possible there are a few files, we don't support it # it is possible there are a few files, we don't support it
[ -s "$returntarname" ] || fatal 'Cant read result from pack: $returntarname is not a readable file.' [ -s "$returntarname" ] || fatal 'Can'\''t read result from pack: $returntarname is not a readable file.'
alpkg=$(basename $returntarname) alpkg=$(basename $returntarname)
# FIXME: looks like a hack with current dir # FIXME: looks like a hack with current dir
...@@ -224,7 +224,7 @@ epm_repack() ...@@ -224,7 +224,7 @@ epm_repack()
pkg_urls= pkg_urls=
fi fi
[ -n "$pkg_names" ] && warning 'Cant find $pkg_names files' [ -n "$pkg_names" ] && warning 'Can'\''t find $pkg_names files'
[ -z "$pkg_files" ] && info "Skip empty repack list" && return 22 [ -z "$pkg_files" ] && info "Skip empty repack list" && return 22
if __epm_repack $pkg_files && [ -n "$repacked_pkgs" ] ; then if __epm_repack $pkg_files && [ -n "$repacked_pkgs" ] ; then
......
...@@ -55,7 +55,7 @@ __epm_repack_to_deb() ...@@ -55,7 +55,7 @@ __epm_repack_to_deb()
repacked_pkg="$repacked_pkg $(realpath $DEBCONVERTED)" repacked_pkg="$repacked_pkg $(realpath $DEBCONVERTED)"
remove_on_exit "$(realpath $DEBCONVERTED)" remove_on_exit "$(realpath $DEBCONVERTED)"
else else
warning 'Cant find converted deb for source binary package $pkg' warning 'Can'\''t find converted deb for source binary package $pkg'
fi fi
clean_store_output clean_store_output
cd - >/dev/null cd - >/dev/null
......
...@@ -276,7 +276,7 @@ __epm_repack_to_rpm() ...@@ -276,7 +276,7 @@ __epm_repack_to_rpm()
remove_on_exit "$repacked_rpm" remove_on_exit "$repacked_rpm"
repacked_pkg="$repacked_rpm" repacked_pkg="$repacked_rpm"
else else
warning 'Cant find converted rpm for source binary package $pkg (got $repacked_rpm)' warning 'Can'\''t find converted rpm for source binary package $pkg (got $repacked_rpm)'
fi fi
cd $EPMCURDIR >/dev/null cd $EPMCURDIR >/dev/null
......
...@@ -31,7 +31,7 @@ __epm_repodisable_alt() ...@@ -31,7 +31,7 @@ __epm_repodisable_alt()
rl="$(echo "$1" | sed -e 's|\^||')" rl="$(echo "$1" | sed -e 's|\^||')"
else else
rl="$( (epm --quiet repolist) 2>/dev/null | grep -F "$1" | head -n1 )" rl="$( (epm --quiet repolist) 2>/dev/null | grep -F "$1" | head -n1 )"
[ -z "$rl" ] && warning 'Cant find $1 entries in the repos (see # epm repolist output)' && return 1 [ -z "$rl" ] && warning 'Can'\''t find $1 entries in the repos (see # epm repolist output)' && return 1
fi fi
echo "$rl" | while read rp ; do echo "$rl" | while read rp ; do
[ -n "$dryrun" ] && message 'will comment $rp' && continue [ -n "$dryrun" ] && message 'will comment $rp' && continue
......
...@@ -31,7 +31,7 @@ __epm_repoenable_alt() ...@@ -31,7 +31,7 @@ __epm_repoenable_alt()
rl="$(echo "$1" | sed -e 's|\^||')" rl="$(echo "$1" | sed -e 's|\^||')"
else else
rl="$( epm --quiet --all repolist 2>/dev/null | grep -F "$1" | head -n1 | sed -e 's|[[:space:]]*#[[:space:]]*||' )" rl="$( epm --quiet --all repolist 2>/dev/null | grep -F "$1" | head -n1 | sed -e 's|[[:space:]]*#[[:space:]]*||' )"
[ -z "$rl" ] && warning 'Cant find commented $1 in the repos (see # epm repolist output)' && return 1 [ -z "$rl" ] && warning 'Can'\''t find commented $1 in the repos (see # epm repolist output)' && return 1
fi fi
echo "$rl" | while read rp ; do echo "$rl" | while read rp ; do
[ -n "$dryrun" ] && message 'will uncomment $rp' && continue [ -n "$dryrun" ] && message 'will uncomment $rp' && continue
......
...@@ -25,7 +25,7 @@ __epm_repo_pkgadd_alt() ...@@ -25,7 +25,7 @@ __epm_repo_pkgadd_alt()
local REPO_DIR="$1" local REPO_DIR="$1"
shift shift
[ -d "$REPO_DIR" ] || fatal 'Cant find repo dir $REPO_DIR.' [ -d "$REPO_DIR" ] || fatal 'Can'\''t find repo dir $REPO_DIR.'
# default name # default name
REPO_NAME="addon" REPO_NAME="addon"
...@@ -57,7 +57,7 @@ __epm_repo_pkgdel_alt() ...@@ -57,7 +57,7 @@ __epm_repo_pkgdel_alt()
local REPO_DIR="$1" local REPO_DIR="$1"
shift shift
[ -d "$REPO_DIR" ] || fatal 'Cant find repo dir $REPO_DIR.' [ -d "$REPO_DIR" ] || fatal 'Can'\''t find repo dir $REPO_DIR.'
[ -n "$1" ] || fatal "Missed package name" [ -n "$1" ] || fatal "Missed package name"
......
...@@ -32,7 +32,7 @@ __save_alt_repo_lists() ...@@ -32,7 +32,7 @@ __save_alt_repo_lists()
for i in /etc/apt/sources.list /etc/apt/sources.list.d/*.list ; do for i in /etc/apt/sources.list /etc/apt/sources.list.d/*.list ; do
[ -s "$i" ] || continue [ -s "$i" ] || continue
local DD="$(echo "$i" | sed -e "s|/etc|$SAVELISTDIR|")" local DD="$(echo "$i" | sed -e "s|/etc|$SAVELISTDIR|")"
cp -af $verbose "$i" "$DD" || fatal 'Cant save apt source list files to $SAVELISTDIR' cp -af $verbose "$i" "$DD" || fatal 'Can'\''t save apt source list files to $SAVELISTDIR'
done done
} }
...@@ -51,7 +51,7 @@ __restore_alt_repo_lists() ...@@ -51,7 +51,7 @@ __restore_alt_repo_lists()
if diff -q "$DD" "$i" >/dev/null ; then if diff -q "$DD" "$i" >/dev/null ; then
rm -f $verbose "$DD" rm -f $verbose "$DD"
else else
mv $verbose "$DD" "$i" || warning 'Cant restore $i file' mv $verbose "$DD" "$i" || warning 'Can'\''t restore $i file'
fi fi
done done
} }
......
...@@ -143,7 +143,7 @@ update_alt_contents_index() ...@@ -143,7 +143,7 @@ update_alt_contents_index()
local REMOTEURL="$(get_url_to_etersoft_mirror "$URL")" local REMOTEURL="$(get_url_to_etersoft_mirror "$URL")"
if [ -n "$REMOTEURL" ] ; then if [ -n "$REMOTEURL" ] ; then
rsync_alt_contents_index $REMOTEURL/base/contents_index.gz $LOCALPATH/contents_index.gz && __add_to_contents_index_list "$REMOTEURL" "$LOCALPATH/contents_index.gz" && continue rsync_alt_contents_index $REMOTEURL/base/contents_index.gz $LOCALPATH/contents_index.gz && __add_to_contents_index_list "$REMOTEURL" "$LOCALPATH/contents_index.gz" && continue
[ -n "$verbose" ] && info 'Note: Cat retrieve $REMOTEURL/base/contents_index.gz, fallback to $URL/base/contents_index' [ -n "$verbose" ] && info 'Note: Can'\''t retrieve $REMOTEURL/base/contents_index.gz, fallback to $URL/base/contents_index'
fi fi
# we don't know if remote server has rsync # we don't know if remote server has rsync
# fix rsync URL firstly # fix rsync URL firstly
......
...@@ -116,7 +116,7 @@ __epm_check_vendor() ...@@ -116,7 +116,7 @@ __epm_check_vendor()
if ! epm_status_validate "$i" ; then if ! epm_status_validate "$i" ; then
# it is missed package probably (package remove case) # it is missed package probably (package remove case)
if is_installed "$i" ; then if is_installed "$i" ; then
warning 'Cant get any info for $i package. Scripts are DISABLED for package $bi. Use --scripts if you need run scripts from such packages.' warning 'Can'\''t get any info for $i package. Scripts are DISABLED for package $bi. Use --scripts if you need run scripts from such packages.'
fi fi
noscripts="--noscripts" noscripts="--noscripts"
continue continue
...@@ -126,7 +126,7 @@ __epm_check_vendor() ...@@ -126,7 +126,7 @@ __epm_check_vendor()
vendor="$(epm print field Vendor for "$i")" vendor="$(epm print field Vendor for "$i")"
if [ -z "$vendor" ] ; then if [ -z "$vendor" ] ; then
warning 'Cant get info about vendor for $i package. Scripts are DISABLED for package $bi. Use --scripts if you need run scripts from such packages.' warning 'Can'\''t get info about vendor for $i package. Scripts are DISABLED for package $bi. Use --scripts if you need run scripts from such packages.'
noscripts="--noscripts" noscripts="--noscripts"
continue continue
fi fi
......
...@@ -117,7 +117,7 @@ query_altlinux_url() ...@@ -117,7 +117,7 @@ query_altlinux_url()
case $PMTYPE in case $PMTYPE in
*-rpm) *-rpm)
local srpm=$(print_srcname "$1") local srpm=$(print_srcname "$1")
[ -n "$srpm" ] || fatal 'Cant get source name for $1' [ -n "$srpm" ] || fatal 'Can'\''t get source name for $1'
echo "$(get_pao_url)/$srpm" echo "$(get_pao_url)/$srpm"
return return
;; ;;
...@@ -139,7 +139,7 @@ for f in $pkg_names $pkg_files ; do ...@@ -139,7 +139,7 @@ for f in $pkg_names $pkg_files ; do
pkg_url=$(query_package_url $f) pkg_url=$(query_package_url $f)
fi fi
[ -n "$pkg_url" ] && open_browser "$pkg_url" && continue [ -n "$pkg_url" ] && open_browser "$pkg_url" && continue
warning 'Cant get URL for $f package' warning 'Can'\''t get URL for $f package'
done done
#for f in $pkg_names ; do #for f in $pkg_names ; do
......
...@@ -261,7 +261,7 @@ Options: ...@@ -261,7 +261,7 @@ Options:
--installable check if <package> can be installed from the repo --installable check if <package> can be installed from the repo
--original check if <package> is from distro repo --original check if <package> is from distro repo
--certified check if <package> is certified that it can be installed without repacking --certified check if <package> is certified that it can be installed without repacking
--thirdparty check if <package> from a third-party source (didnt packed for this distro) --thirdparty check if <package> from a third-party source (didn'\''t packed for this distro)
--repacked check if <package> was repacked with epm repack --repacked check if <package> was repacked with epm repack
--validate check if <package> is accessible (we can get a fields from it) --validate check if <package> is accessible (we can get a fields from it)
' '
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment