Skip to content

Commit b64259b

Browse files
committed
remove unchanged file
1 parent 3a93239 commit b64259b

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

common/functions.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ device_check() {
5757
}
5858

5959
cp_ch() {
60-
local opt=`getopt -o nr -- "$@"` BAK=true UBAK=true FOL=false
60+
local opt=`getopt -o nr -- "$@"` BAK=true UBAK=true FOL=false OFILE
6161
eval set -- "$opt"
6262
while true; do
6363
case "$1" in
@@ -93,6 +93,10 @@ cp_ch() {
9393
done
9494
}
9595

96+
rm_if_same() {
97+
cmp -s "$1" "$2" && rm "$2"
98+
}
99+
96100
install_script() {
97101
case "$1" in
98102
-b) shift;

common/install.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ if $PATCH; then
144144
sed -i "/^ *raw {/,/}/ s|flags .*|flags AUDIO_OUTPUT_FLAG_PRIMARY|" $FILE
145145
sed -i "/^ *primary {/,/}/ s/|AUDIO_OUTPUT_FLAG_DEEP_BUFFER//g" $FILE;;
146146
esac
147+
rm_if_same $ORIGDIR$OFILE $FILE
147148
done
148149
elif $REMV; then
149150
ui_print " Using remove logic"
@@ -153,12 +154,15 @@ elif $REMV; then
153154
for BUFFER in "Earpiece" "Speaker" "Wired Headset" "Wired Headphones" "Line" "HDMI" "Proxy" "FM" "BT SCO All" "USB Device Out" "Telephony Tx" "voice_rx" "primary input" "surround_sound" "record_24" "BT A2DP Out" "BT A2DP Headphones" "BT A2DP Speaker"; do
154155
sed -i "/$BUFFER/ s/$FLAG,//g" $MODPATH/system/etc/audio_policy_configuration.xml
155156
done
157+
rm_if_same $ORIGDIR/system/etc/audio_policy_configuration.xml $MODPATH/system/etc/audio_policy_configuration.xml
156158
elif [ ! -f $ORIGDIR/vendor/etc/audio_output_policy.conf ] && [ -f $ORIGDIR/system/etc/audio_policy_configuration.xml ]; then
157159
[ -f $MODPATH/system/etc/audio_policy_configuration.xml ] || cp_ch $ORIGDIR/system/etc/audio_policy_configuration.xml $MODPATH/system/etc/audio_policy_configuration.xml
158160
sed -ri "s/$FLAG,|,$FLAG//g" $MODPATH/system/etc/audio_policy_configuration.xml
161+
rm_if_same $ORIGDIR/system/etc/audio_policy_configuration.xml $MODPATH/system/etc/audio_policy_configuration.xml
159162
elif [ -f $ORIGDIR/vendor/etc/audio/audio_policy_configuration.xml ]; then
160163
[ -f $MODPATH/system/vendor/etc/audio/audio_policy_configuration.xml ] || cp_ch $ORIGDIR/vendor/etc/audio/audio_policy_configuration.xml $MODPATH/system/vendor/etc/audio/audio_policy_configuration.xml
161164
sed -ri "s/$FLAG,|,$FLAG//g" $MODPATH/system/vendor/etc/audio/audio_policy_configuration.xml
165+
rm_if_same $ORIGDIR/vendor/etc/audio/audio_policy_configuration.xml $MODPATH/system/vendor/etc/audio/audio_policy_configuration.xml
162166
else
163167
for OFILE in ${POLS}; do
164168
FILE="$MODPATH$(echo $OFILE | sed "s|^/vendor|/system/vendor|g")"
@@ -167,6 +171,7 @@ elif $REMV; then
167171
*.conf) sed -i "/$FLAG {/,/}/d" $FILE;;
168172
*.xml) sed -ri "s/$FLAG,|,$FLAG//g" $FILE;;
169173
esac
174+
rm_if_same $ORIGDIR$OFILE $FILE
170175
done
171176
fi
172177
done
@@ -179,6 +184,7 @@ if $NOTIF; then
179184
FILE="$MODPATH$(echo $OFILE | sed "s|^/vendor|/system/vendor|g")"
180185
cp_ch $ORIGDIR$OFILE $FILE
181186
osp_detect_notification $FILE
187+
rm_if_same $ORIGDIR$OFILE $FILE
182188
done
183189
fi
184190

@@ -211,13 +217,15 @@ if $USB; then
211217
grep -iE "tagName=\"usb[ _]+.* out\"" $FILE | sed -r "s/.*ame=\"([A-Za-z_ ]*)\".*/\1/" | while read i; do
212218
patch_xml $FILE "/module/devicePorts/devicePort[@tagName=\"$i\"]/profile[@name=\"\"]"
213219
done
220+
rm_if_same $ORIGDIR$OFILE $FILE
214221
done
215222
else
216223
for OFILE in ${APS}; do
217224
FILE="$MODPATH$(echo $OFILE | sed "s|^/vendor|/system/vendor|g")"
218225
cp_ch $ORIGDIR$OFILE $FILE
219226
SPACES=$(sed -n "/^ *usb {/p" $FILE | sed -r "s/^( *).*/\1/")
220227
sed -i "/^$SPACES\usb {/,/^$SPACES}/ s/\(^ *\)sampling_rates .*/\1sampling_rates 48000/g" $FILE
228+
rm_if_same $ORIGDIR$OFILE $FILE
221229
done
222230
fi
223231
fi

0 commit comments

Comments
 (0)