Bob Mottram 10 年前
父节点
当前提交
b741fc06b4
共有 1 个文件被更改,包括 4 次插入11 次删除
  1. 4
    11
      install-freedombone.sh

+ 4
- 11
install-freedombone.sh 查看文件

@@ -1086,15 +1086,8 @@ function change_debian_repos {
1086 1086
 
1087 1087
   # ensure that there is a security repo
1088 1088
   if ! grep -q "security" /etc/apt/sources.list; then
1089
-      if grep -q "jessie" /etc/apt/sources.list; then
1090
-          echo "deb http://security.debian.org/ jessie/updates main contrib" >> /etc/apt/sources.list
1091
-          echo "#deb-src http://security.debian.org/ jessie/updates main contrib" >> /etc/apt/sources.list
1092
-      else
1093
-          if grep -q "wheezy" /etc/apt/sources.list; then
1094
-              echo "deb http://security.debian.org/ wheezy/updates main contrib" >> /etc/apt/sources.list
1095
-              echo "#deb-src http://security.debian.org/ wheezy/updates main contrib" >> /etc/apt/sources.list
1096
-          fi
1097
-      fi
1089
+      echo "deb http://security.debian.org/ $DEBIAN_VERSION/updates main contrib" >> /etc/apt/sources.list
1090
+      echo "#deb-src http://security.debian.org/ $DEBIAN_VERSION/updates main contrib" >> /etc/apt/sources.list
1098 1091
   fi
1099 1092
 
1100 1093
   apt-get update
@@ -1198,8 +1191,8 @@ function enable_backports {
1198 1191
   if grep -Fxq "enable_backports" $COMPLETION_FILE; then
1199 1192
       return
1200 1193
   fi
1201
-  if ! grep -Fxq "deb http://$DEBIAN_REPO/debian jessie-backports main" /etc/apt/sources.list; then
1202
-    echo "deb http://$DEBIAN_REPO/debian jessie-backports main" >> /etc/apt/sources.list
1194
+  if ! grep -Fxq "deb http://$DEBIAN_REPO/debian $DEBIAN_VERSION-backports main" /etc/apt/sources.list; then
1195
+    echo "deb http://$DEBIAN_REPO/debian $DEBIAN_VERSION-backports main" >> /etc/apt/sources.list
1203 1196
   fi
1204 1197
   echo 'enable_backports' >> $COMPLETION_FILE
1205 1198
 }