calculate/calculate-utils-3-core
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

deleted unneeded py2 script

Browse source
This commit is contained in:
idziubenko 2021-08-09 12:17:29 +03:00
parent 2a487c08f2
commit 2009b912d3
6 changed files with 2 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bin/cl-core_py2
View file

@ -1,21 +0,0 @@
#!/usr/bin/env python2
# -*- coding: utf-8 -*-
# Copyright 2012-2016 Mir Calculate. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import calculate.core.core_main as core_main
if __name__ == '__main__':
core_main.core_main()

21
bin/cl-core_py3
View file

@ -1,21 +0,0 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright 2012-2016 Mir Calculate. http://www.calculate-linux.org
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import calculate.core.core_main as core_main
if __name__ == '__main__':
core_main.core_main()

2
pym/core/server/cl_server.py
View file

@ -45,7 +45,7 @@ _('No module named %s')
def main(*args, **keywords):
_args = list(unpack_single_opts(sys.argv[1:]))
caller = os.path.basename(sys.argv[0])
if not (caller == 'cl-core' or caller == 'cl-core_py3'):
if not (caller == 'cl-core'):
parser = cert_cmd.parse(full=False)
args, unknown_args = parser.parse_known_args(_args)
args.method = '_temp_'

1
pym/core/server/gen_pid.py
View file

@ -50,7 +50,6 @@ def get_symlink_commands():
for line in readLinesFile(symlinks):
yield line.strip()
yield "/usr/bin/cl-core"
yield "/usr/bin/cl-core_py3"
yield "/usr/bin/cl-update"
yield "/usr/bin/cl-core-patch"

2
pym/core/server/local_call.py
View file

@ -188,7 +188,7 @@ def local_method(metaObject, args, unknown_args):
sym_link = os.path.basename(sys.argv[0])
# sym_link = "cl-core"
if not (sym_link == 'cl-core' or sym_link == 'cl-core_py3'):
if not (sym_link == 'cl-core'):
if sym_link in LoadedMethods.conMethods.keys():
args.method = LoadedMethods.conMethods[sym_link][0]
else:

1
setup.py
View file

@ -113,7 +113,6 @@ setup(
license = "http://www.apache.org/licenses/LICENSE-2.0",
data_files = (
('/usr/sbin', [('bin/cl-core',0o755)]),
('/usr/sbin', [('bin/cl-core_py2',0o755)]),
('/etc/init.d', [('data/calculate-core',0o755)]),
('/usr/share/man/man1',glob('man/cl-*')),
('/usr/share/man/ru/man1',glob('man/ru/*')),