parent
0e4bb831b9
commit
dc4fca8984
@ -0,0 +1,61 @@
|
||||
diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo
|
||||
index 9d6b44b..5aefcc5 100644
|
||||
Binary files a/i18n/cl_builder_ru.mo and b/i18n/cl_builder_ru.mo differ
|
||||
diff --git a/pym/cl_builder.py b/pym/cl_builder.py
|
||||
index f0bf9c5..f3a50c9 100644
|
||||
--- a/pym/cl_builder.py
|
||||
+++ b/pym/cl_builder.py
|
||||
@@ -93,6 +93,7 @@ class cl_builder(color_print):
|
||||
self.force = False
|
||||
self.assembleIso = False
|
||||
self.envFile = '/etc/calculate/assemble.env'
|
||||
+ self.curProfile = None
|
||||
|
||||
def setNoColor(self):
|
||||
self.color = False
|
||||
@@ -226,6 +227,37 @@ class cl_builder(color_print):
|
||||
distrPath = distr.convertToDirectory().getDirectory()
|
||||
self.cleanNeedlessKernelData(distrPath)
|
||||
self.applyTemplatesForSquash(distrPath)
|
||||
+ # change make.profile
|
||||
+ builderPath = self.clVars.Get('cl_builder_path')
|
||||
+ curProfileFile = pathJoin(builderPath,"etc/make.profile")
|
||||
+ self.curProfile = os.readlink(curProfileFile)
|
||||
+ profile = self.clVars.Get('os_builder_profile')
|
||||
+ newProfile = None
|
||||
+ if not self.curProfile.endswith(profile):
|
||||
+ if profile.startswith("calculate"):
|
||||
+ newProfile = path.join("../var/lib/layman/calculate/profiles",
|
||||
+ profile)
|
||||
+ else:
|
||||
+ newProfile = path.join("../usr/portage/profiles",
|
||||
+ profile)
|
||||
+ os.unlink(curProfileFile)
|
||||
+ os.symlink(newProfile,curProfileFile)
|
||||
+
|
||||
+
|
||||
+ def restoreProfile(self):
|
||||
+ """Restore profile"""
|
||||
+ if not self.curProfile:
|
||||
+ return
|
||||
+ self.printMessageForTest(_("Restore system profile"))
|
||||
+ builderPath = self.clVars.Get('cl_builder_path')
|
||||
+ curProfileFile = pathJoin(builderPath,"etc/make.profile")
|
||||
+ profile = self.clVars.Get('os_builder_profile')
|
||||
+ newProfile = None
|
||||
+ if not self.curProfile.endswith(profile):
|
||||
+ os.unlink(curProfileFile)
|
||||
+ os.symlink(self.curProfile,curProfileFile)
|
||||
+ self.curProfile = None
|
||||
+ self.printByResult(True)
|
||||
|
||||
def isoPrepacking(self,directory):
|
||||
self.printByResult(True)
|
||||
@@ -541,6 +573,7 @@ class cl_builder(color_print):
|
||||
self.printByResult(True)
|
||||
if self.assembleIso:
|
||||
self.restoreMount()
|
||||
+ self.restoreProfile()
|
||||
except (BuilderError,DistributiveError),e:
|
||||
error = "%s\n%s" % (str(error),_("Unmounting error"))
|
||||
except KeyboardInterrupt,e:
|
||||
@ -1,30 +0,0 @@
|
||||
diff --git a/install/2laptop/samsung/calculate-install/bin/backlight b/install/2laptop/samsung/calculate-install/bin/backlight
|
||||
index eb8e2d0..8ccef8e 100644
|
||||
--- a/install/2laptop/samsung/calculate-install/bin/backlight
|
||||
+++ b/install/2laptop/samsung/calculate-install/bin/backlight
|
||||
@@ -21,13 +21,23 @@ var1d=$((0x$var1))
|
||||
case "$1" in
|
||||
up)
|
||||
#calculate new brightness
|
||||
- var2=`echo "ibase=10; obase=16; a=($var1d+$AMOUNT);if (a<255) print a else print 255" | bc`
|
||||
+ var2=$(($var1d + $AMOUNT))
|
||||
+ if [[ $var2 -gt 255 ]]
|
||||
+ then
|
||||
+ var2=255
|
||||
+ fi
|
||||
+ var2=`printf "%x" $var2`
|
||||
echo "$0: increasing brightness from 0x$var1 to 0x$var2"
|
||||
setpci -s $DEVICE F4.B=$var2
|
||||
;;
|
||||
down)
|
||||
#calculate new brightness
|
||||
- var2=`echo "ibase=10; obase=16; a=($var1d-$AMOUNT);if (a>$MIN) print a else print $MIN" | bc`
|
||||
+ var2=$(($var1d - $AMOUNT))
|
||||
+ if [[ $var2 -lt $MIN ]]
|
||||
+ then
|
||||
+ var2=$MIN
|
||||
+ fi
|
||||
+ var2=`printf "%x" $var2`
|
||||
echo "$0: decreasing brightness from 0x$var1 to 0x$var2"
|
||||
setpci -s $DEVICE F4.B=$var2
|
||||
;;
|
||||
Loading…
Reference in new issue