Перенастройка bash

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/.calculate_directory

@@ -1 +1 @@
-# Calculate merge()!=&&pkg()!= path=/etc
+# Calculate merge()!=&&pkg()>=4.3_p42-r1 path=/etc

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc

@@ -1,25 +0,0 @@
-# Calculate comment=# format=patch dotall
-<reg>(?:(?:
-#--- Start block generated by Calculate Utilities ---
-.*
-#--- End block generated by Calculate Utilities ---)|(?:
-$))(.*$)</reg>
-<text>
-#--- Start block generated by Calculate Utilities ---
-case ${COLORTERM} in
-    xfce4-terminal*)
-        [[ -z $TMUX ]] &amp;&amp; export TERM=xterm-256color
-    ;;
-esac
-. /etc/bash/preexec.sh
-#--- End block generated by Calculate Utilities ---\1</text>
-<reg>
-
-(# Try to keep environment pollution down, EPA loves us.
-unset use_color safe_term match_lhs)</reg>
-<text>
-
-source /etc/bash/calculate.sh
-\1</text>
-<reg>source /etc/bash/color.sh</reg>
-<text>source /etc/bash/calculate.sh</text>

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/glxgears.sh

@@ -0,0 +1,4 @@
+# Calculate comment=#
+#!/bin/bash
+
+alias glxgears='vblank_mode=0 glxgears'

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/screen_preexec.sh

@@ -1,4 +1,4 @@
-# Calculate comment=# path=/etc/bash
+# Calculate comment=#
 #!/bin/bash
 
 if [[ "$SCREEN_RUN_HOST" == "" ]]

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/tmux_color.sh

@@ -0,0 +1,8 @@
+# Calculate comment=#
+#!/bin/bash
+
+case ${COLORTERM} in
+    xfce4-terminal*)
+        [[ -z $TMUX ]] && export TERM=xterm-256color
+    ;;
+esac

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/wgetpaste_color.sh

@@ -0,0 +1,4 @@
+# Calculate comment=#
+#!/bin/bash
+
+alias glxgears='vblank_mode=0 glxgears'

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/bashrc.d/xz_threads.sh

@@ -0,0 +1,4 @@
+# Calculate comment=#
+#!/bin/bash
+
+XZ_OPT="--threads=0"

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/calculate.sh

@@ -1,11 +0,0 @@
-# Calculate comment=# path=/etc/bash
-#!/bin/bash
-
-# use color output for pastebin.calculate-linux.org by wgetpaste
-if ${use_color} ; then
-	alias emerge='emerge --color=y'
-	alias eix='eix -F'
-fi
-
-alias glxgears='vblank_mode=0 glxgears'
-

profiles/templates/3.3/2_ac_install_merge/app-shells/bash/color.sh

@@ -1 +0,0 @@
-# Calculate append=remove

profiles/templates/3.3/6_ac_update_sync/revision/67-rebuild_bash

@@ -0,0 +1,19 @@
+# Calculate ini(overlay-calculate.revision)<67 exec=/bin/bash
+
+#-ini(overlay-calculate.revision,67)-#
+
+# key is pkg name, value is current version new reduced version split by space
+declare -A map_move=( ["app-shells/bash"]="4.3_p42-r1 4.3_rc73" )
+
+PKGDB=/var/db/pkg
+for pkg in ${!map_move[@]}
+do
+    vers=(${map_move[$pkg]})
+    if [[ -d $PKGDB/${pkg}-${vers[0]} ]]
+    then
+        cp -a $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
+        rm -rf $PKGDB/${pkg}-${vers[0]}
+    fi
+done
+
+true