Module refactoring

master3.3 3.2.2_beta1
Mike Khiretskiy 10 years ago
parent 9c68a61b22
commit 18a425e4ea

@ -1,73 +0,0 @@
#!/usr/bin/env python2
#-*- coding: utf-8 -*-
# Copyright 2010 Calculate Ltd. 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 sys
import os
sys.path.insert(0,os.path.abspath('/usr/lib/calculate-2.2/calculate-lib/pym'))
sys.path.insert(0,\
os.path.abspath('/usr/lib/calculate-2.2/calculate-client/pym'))
from cl_lang import lang
tr = lang()
tr.setGlobalDomain('cl_client')
tr.setLanguage(sys.modules[__name__])
from cl_client_cmd import client_cmd
if __name__ == "__main__":
obj = client_cmd()
ret = obj.optobj.parse_args()
if ret is False:
sys.exit(1)
opts, args = ret
# Установка цвета при печати сообщений
obj.setPrintNoColor(opts)
# Установка переменных
if not obj.setVars(opts):
sys.exit(1)
# Печать переменных
obj.printVars(opts)
# Если нет печати переменных выполняем логику программы
if not opts.v and not opts.filter and not opts.xml:
if args:
domainName = args[0]
# Ввод в домен
if not obj.addDomain(domainName):
sys.exit(1)
elif opts.r:
# Вывод из домена
if not obj.delDomain():
sys.exit(1)
elif opts.mount:
# Монтирование remote
if not obj.mountRemote():
sys.exit(1)
elif opts.install:
# update env files from calculate utilities 2.1 to 2.2
if obj.updateEnvFiles():
obj.logicObj.clVars.flIniFile()
# Наложение шаблонов на систему при инсталяции
if not obj.install():
sys.exit(1)
elif opts.uninstall:
# Наложение шаблонов на систему при деинсталяции
if not obj.uninstall():
sys.exit(1)
# Запись переменных
if not obj.writeVars(opts):
sys.exit(1)
sys.exit(0)

@ -1,52 +0,0 @@
#!/usr/bin/env python2
#-*- coding: utf-8 -*-
# Copyright 2010 Calculate Ltd. 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 sys
import os
sys.path.insert(0,os.path.abspath('/usr/lib/calculate-2.2/calculate-lib/pym'))
sys.path.insert(0,\
os.path.abspath('/usr/lib/calculate-2.2/calculate-client/pym'))
from cl_lang import lang
tr = lang()
tr.setGlobalDomain('cl_client')
tr.setLanguage(sys.modules[__name__])
from cl_passwd_cmd import passwd_cmd
if __name__ == "__main__":
obj = passwd_cmd()
ret = obj.optobj.parse_args()
if ret is False:
sys.exit(1)
opts, args = ret
# Установка цвета при печати сообщений
obj.setPrintNoColor(opts)
# Установка переменных
if not obj.setVars(opts):
sys.exit(1)
# Печать переменных
obj.printVars(opts)
# Если нет печати переменных выполняем логику программы
if not opts.v and not opts.filter and not opts.xml:
# Изменение пароля пользователя
if not obj.setUserPasswordToServer():
sys.exit(1)
# Запись переменных
if not obj.writeVars(opts):
sys.exit(1)
sys.exit(0)

@ -1,68 +0,0 @@
#!/usr/bin/env python2
#-*- coding: utf-8 -*-
# Copyright 2010 Calculate Ltd. 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 sys
import os
sys.path.insert(0,os.path.abspath('/usr/lib/calculate-2.2/calculate-lib/pym'))
sys.path.insert(0,\
os.path.abspath('/usr/lib/calculate-2.2/calculate-client/pym'))
from cl_lang import lang
tr = lang()
tr.setGlobalDomain('cl_client')
tr.setLanguage(sys.modules[__name__])
from cl_sync_cmd import sync_cmd
if __name__ == "__main__":
obj = sync_cmd()
ret = obj.optobj.parse_args()
if ret is False:
sys.exit(1)
opts, args = ret
# Установка цвета при печати сообщений
obj.setPrintNoColor(opts)
if len(args) > 0:
userName = args[0]
else:
userName = ""
if userName:
# Установка имени пользователя
obj.setUserName(userName)
# Установка переменных
if not obj.setVars(opts):
sys.exit(1)
# Печать переменных
obj.printVars(opts)
# Если нет печати переменных выполняем логику программы
if not opts.v and not opts.filter and not opts.xml:
if userName:
sync = not opts.nosync
if opts.login:
# Монтирование ресурсов и синхронизация при входе
if not obj.mountUserResAndSync(sync=sync,
progress=opts.progress):
sys.exit(1)
elif opts.logout:
# Отмонтирование ресурсов и синхронизация при выходе
if not obj.umountUserResAndSync(sync=sync,
progress=opts.progress):
sys.exit(1)
# Запись переменных
if not obj.writeVars(opts):
sys.exit(1)
sys.exit(0)

@ -18,14 +18,14 @@
# limitations under the License.
__app__ = "calculate-client"
__version__ = "3.2.0_alpha1"
__version__ = "3.2.2"
import os
from glob import glob
from distutils.core import setup, Extension
from calculate.install_data import install_data
data_files = [('/etc/init.d', [('data/client',0755)]),
('/usr/sbin', [('data/logout', 0755)]),
('/usr/sbin', [('data/cl-client-resume-remount', 0755)]),
('/usr/share/calculate/xdm/login.d',
['data/login.d/10client']),
('/usr/share/calculate/xdm/login.d',
@ -36,6 +36,12 @@ data_files = [('/etc/init.d', [('data/client',0755)]),
['data/logout.d/15resume_remount']),
('/usr/share/calculate/xdm/',[('data/wait_domain',0755)])]
packages = [
"calculate."+str('.'.join(root.split(os.sep)[1:]))
for root, dirs, files in os.walk('pym/client')
if '__init__.py' in files
]
setup(
name = __app__,
version = __version__,
@ -44,8 +50,8 @@ setup(
author_email = "support@calculate.ru",
url = "http://calculate-linux.org",
license = "http://www.apache.org/licenses/LICENSE-2.0",
package_dir = {'calculate.client': "client"},
packages = ['calculate.client','calculate.client.utils',
'calculate.client.variables'],
package_dir = {'calculate.client': "pym/client"},
packages = packages,
data_files = data_files,
scripts=(glob('bin/*')),
cmdclass={'install_data': install_data})

Loading…
Cancel
Save